Minor improvements on the common mode classes

Andreas Mathis · sawenzel · commit c6faef645d08 · 2019-11-20T08:41:50.000+01:00
o fix for segfault in triggered mode
o simplify logic
o improve assignment
diff --git a/Detectors/TPC/simulation/include/TPCSimulation/CommonMode.h b/Detectors/TPC/simulation/include/TPCSimulation/CommonMode.h
@@ -56,8 +56,8 @@ class CommonMode
 
  private:
   float mCommonMode = 0.f;      ///< Common mode value
-  TimeBin mTimebin = -1;        ///< Time bin
-  unsigned char mGEMstack = -1; ///< GEM stack
+  TimeBin mTimebin = 0;         ///< Time bin
+  unsigned char mGEMstack = 0;  ///< GEM stack
 
   ClassDefNV(CommonMode, 1);
 };
diff --git a/Detectors/TPC/simulation/include/TPCSimulation/DigitTime.h b/Detectors/TPC/simulation/include/TPCSimulation/DigitTime.h
@@ -125,9 +125,8 @@ inline void DigitTime::fillOutputContainer(std::vector<Digit>& output, dataforma
 {
   static Mapper& mapper = Mapper::instance();
   GlobalPadNumber globalPad = 0;
-  float cm;
   for (size_t i = 0; i < mCommonMode.size(); ++i) {
-    cm = getCommonMode(GEMstack(i));
+    const float cm = getCommonMode(GEMstack(i));
     if (cm > 0.) {
       commonModeOutput.push_back({cm, timeBin, static_cast<unsigned char>(i)});
     }
diff --git a/Steer/DigitizerWorkflow/src/TPCDigitRootWriterSpec.cxx b/Steer/DigitizerWorkflow/src/TPCDigitRootWriterSpec.cxx
@@ -114,9 +114,8 @@ DataProcessorSpec getTPCDigitRootWriterSpec(int numberofsourcedevices)
         if (entries == -1) {
           entries = brentries;
         } else {
-          if (brentries != entries) {
-            LOG(WARNING) << "INCONSISTENT NUMBER OF ENTRIES IN BRANCHES " << entries << " vs " << brentries;
-            entries = brentries;
+          if (brentries != entries && !TString(br->GetName()).Contains("CommonMode")) {
+            LOG(WARNING) << "INCONSISTENT NUMBER OF ENTRIES IN BRANCH " << br->GetName() << ": " << entries << " vs " << brentries;
           }
         }
       }
@@ -307,25 +306,10 @@ DataProcessorSpec getTPCDigitRootWriterSpec(int numberofsourcedevices)
               LOG(FATAL) << "CommonMode for sector " << sector << " are received w/o info on grouping in triggers";
             }
             {
-              if (trigS.size() == 1) { // just 1 entry (continous mode?), use digits directly
-                // connect this to a particular branch
-                auto digC = &commonModeData;
-                auto br = getOrMakeBranch(*outputtree.get(), "TPCCommonMode", sector, digC);
-                br->Fill();
-                br->ResetAddress();
-              } else {                                     // triggered mode (>1 entrie will be written)
-                std::vector<o2::tpc::CommonMode> comGroup; // group of digits related to single trigger
-                auto comGroupPtr = &comGroup;
-                auto br = getOrMakeBranch(*outputtree.get(), "TPCCommonMode", sector, comGroupPtr);
-                for (auto grp : trigS) {
-                  comGroup.clear();
-                  for (int i = 0; i < grp.getEntries(); i++) {
-                    comGroup.emplace_back(commonModeData[grp.getFirstEntry() + i]); // fetch digits of given trigger
-                  }
-                  br->Fill();
-                }
-                br->ResetAddress();
-              }
+              auto digC = &commonModeData;
+              auto br = getOrMakeBranch(*outputtree.get(), "TPCCommonMode", sector, digC);
+              br->Fill();
+              br->ResetAddress();
             }
           }
         } // end common mode case

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,8 @@ inline void DigitTime::fillOutputContainer(std::vector<Digit>& output, dataforma`
`125`	`125`	`{`
`126`	`126`	`static Mapper& mapper = Mapper::instance();`
`127`	`127`	`GlobalPadNumber globalPad = 0;`
`128`		`- float cm;`
`129`	`128`	`for (size_t i = 0; i < mCommonMode.size(); ++i) {`
`130`		`- cm = getCommonMode(GEMstack(i));`
	`129`	`+ const float cm = getCommonMode(GEMstack(i));`
`131`	`130`	`if (cm > 0.) {`
`132`	`131`	`commonModeOutput.push_back({cm, timeBin, static_cast<unsigned char>(i)});`
`133`	`132`	`}`