Rebasing MR1179

Used to rebase the changes introduced through !1179 (closed)

core/detectors/trd/CbmTrdParModAsic.cxx

@@ -17,7 +17,7 @@
 #include <TGenericClassInfo.h>  // for TGenericClassInfo
 #include <TObjArray.h>
 #include <TObjString.h>
-#include <TString.h>            // for Form
+#include <TString.h>  // for Form
 #include <TSystem.h>
 
 #include <utility>  // for pair
@@ -39,7 +39,8 @@ CbmTrdParModAsic::CbmTrdParModAsic(const char* name, const char* title)
 //_______________________________________________________________________________
 void CbmTrdParModAsic::clear()
 {
-  for(auto asic : fModPar) delete asic.second;
+  for (auto asic : fModPar)
+    delete asic.second;
   fModPar.clear();
 }
 
@@ -62,7 +63,8 @@ void CbmTrdParModAsic::GetAsicAddresses(std::vector<Int_t>* a) const
   /** Query the ASICs in the module set for their addresses. 
  * Returns the list of these addresses in the vector prepared by the user   
  */
-  for (auto asic : fModPar) a->push_back(asic.first);
+  for (auto asic : fModPar)
+    a->push_back(asic.first);
 }
 
 //_______________________________________________________________________________
@@ -83,18 +85,12 @@ CbmTrdParAsic* CbmTrdParModAsic::GetAsicPar(Int_t address)
 int CbmTrdParModAsic::GetNofAsics() const
 {
   switch (fType) {
-    case 1:
-      return 80;
-    case 3:
-      return 20;
-    case 5:
-      return 180;
-    case 7:
-      return 36;
-    case 8:
-      return 24;
-    case 9:
-      return 180;
+    case 1: return 80;
+    case 3: return 20;
+    case 5: return 180;
+    case 7: return 36;
+    case 8: return 24;
+    case 9: return 180;
     default:
       LOG(warn) << GetName() << "::GetNofAsics : The chamber type " << fType << " has no mapping to ASICs. Skip.";
   }
@@ -109,22 +105,32 @@ CbmTrdDigi::eCbmTrdAsicType CbmTrdParModAsic::GetAsicType() const
     case 3:
     case 5:
     case 7:
-    case 8:
-      return CbmTrdDigi::eCbmTrdAsicType::kSPADIC;
-    case 9:
-      return CbmTrdDigi::eCbmTrdAsicType::kFASP;
+    case 8: return CbmTrdDigi::eCbmTrdAsicType::kSPADIC;
+    case 9: return CbmTrdDigi::eCbmTrdAsicType::kFASP;
     default:
       LOG(warn) << GetName() << "::GetAsicType : The chamber type " << fType << " has no mapping to ASICs. Skip.";
   }
   return CbmTrdDigi::eCbmTrdAsicType::kNTypes;
 }
 
+//_______________________________________________________________________________
+int CbmTrdParModAsic::HasEqId(uint16_t eq) const
+{
+  int idx(0);
+  for (auto add : fCrobAdd) {
+    if (add == eq) return idx;
+    idx++;
+  }
+  return -1;
+}
+
 //_______________________________________________________________________________
 void CbmTrdParModAsic::Print(Option_t* opt) const
 {
   printf(" %s Asics[%d]\n", GetName(), GetNofAsics());
   if (strcmp(opt, "all") == 0) {
-    for (auto asic : fModPar) asic.second->Print(opt);
+    for (auto asic : fModPar)
+      asic.second->Print(opt);
   }
 }
 
@@ -148,11 +154,10 @@ void CbmTrdParModAsic::SetCrobAddresses(int* addresses)
     case 3:
     case 5:
     case 7:
-    case 8:
-      fCrobAdd[0] = addresses[0];
-      break;
+    case 8: fCrobAdd.push_back(addresses[0]); break;
     case 9:
-      for (int i(0); i < NCROBMOD; i++) fCrobAdd[i] = addresses[i];
+      for (int i(0); i < NCROBMOD; i++)
+        fCrobAdd.push_back(addresses[i]);
       break;
     default:
       LOG(warn) << GetName() << "::SetCrobAddresses : The chamber type " << fType << " has no mapping to CROBs. Skip.";