fixes for PR 4645

noferini · shahor02 · commit 7397c7bbde5d · 2020-10-24T14:39:05.000+02:00
diff --git a/DataFormats/Detectors/TOF/include/DataFormatsTOF/CTF.h b/DataFormats/Detectors/TOF/include/DataFormatsTOF/CTF.h
@@ -35,7 +35,7 @@ struct CTFHeader {
   uint32_t firstOrbit = 0;    /// 1st orbit of TF
   uint16_t firstBC = 0;       /// 1st BC of TF
 
-  ClassDefNV(CTFHeader, 2);
+  ClassDefNV(CTFHeader, 1);
 };
 
 /// Compressed but not yet entropy-encoded infos
diff --git a/Detectors/TOF/base/include/TOFBase/Digit.h b/Detectors/TOF/base/include/TOFBase/Digit.h
@@ -116,12 +116,7 @@ struct ReadoutWindowData {
   o2::dataformats::RangeReference<int, int> refDiagnostic;
 
   // crate info for diagnostic patterns
-  int mNdiaCrate[72] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+  int mNdiaCrate[72] = {0};
 
   InteractionRecord mFirstIR{0, 0};
 
diff --git a/Detectors/TOF/base/include/TOFBase/WindowFiller.h b/Detectors/TOF/base/include/TOFBase/WindowFiller.h
@@ -28,9 +28,9 @@ class WindowFiller
   struct PatternData {
     uint32_t pattern;
     int icrate;
-    ulong row;
+    unsigned long row;
 
-    PatternData(uint32_t patt = 0, int icr = 0, ulong rw = 0) : pattern(patt), icrate(icr), row(rw) {}
+    PatternData(uint32_t patt = 0, int icr = 0, unsigned long rw = 0) : pattern(patt), icrate(icr), row(rw) {}
   };
 
   WindowFiller() { initObj(); };
@@ -64,8 +64,7 @@ class WindowFiller
 
   void clearCounts()
   {
-    for (int i = 0; i < o2::tof::Geo::NCHANNELS; i++)
-      mChannelCounts[i] = 0;
+    memset(mChannelCounts, 0, o2::tof::Geo::NCHANNELS * sizeof(mChannelCounts[0]));
   }
 
   std::vector<uint32_t>& getPatterns() { return mPatterns; }
diff --git a/Detectors/TOF/base/src/WindowFiller.cxx b/Detectors/TOF/base/src/WindowFiller.cxx
@@ -129,22 +129,19 @@ void WindowFiller::fillOutputContainer(std::vector<Digit>& digits)
     int npatterns = 0;
 
     // check if patterns are in the current row
-    int ipatt = mCratePatterns.size() - 1;
     for (std::vector<PatternData>::reverse_iterator it = mCratePatterns.rbegin(); it != mCratePatterns.rend(); ++it) {
       if (it->row > mReadoutWindowCurrent)
         break;
 
       if (it->row < mReadoutWindowCurrent) { // this should not happen
         LOG(ERROR) << "One pattern skipped because appears to occur early of the current row " << it->row << " < " << mReadoutWindowCurrent << " ?!";
-        mCratePatterns.erase(mCratePatterns.begin() + ipatt);
       } else {
         mPatterns.push_back(it->pattern);
         info.addedDiagnostic(it->icrate);
 
-        mCratePatterns.erase(mCratePatterns.begin() + ipatt);
         npatterns++;
       }
-      ipatt--;
+      mCratePatterns.pop_back();
     }
 
     info.setFirstEntryDia(firstPattern);
diff --git a/Detectors/TOF/workflow/src/CompressedDecodingTask.cxx b/Detectors/TOF/workflow/src/CompressedDecodingTask.cxx
@@ -97,10 +97,10 @@ void CompressedDecodingTask::postData(ProcessingContext& pc)
   pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "DIGITS", 0, Lifetime::Timeframe}, *alldigits);
   pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "READOUTWINDOW", 0, Lifetime::Timeframe}, *row);
 
-  std::vector<uint32_t> patterns = mDecoder.getPatterns();
+  std::vector<uint32_t>& patterns = mDecoder.getPatterns();
   pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "PATTERNS", 0, Lifetime::Timeframe}, patterns);
 
-  std::vector<uint64_t> errors = mDecoder.getErrors();
+  std::vector<uint64_t>& errors = mDecoder.getErrors();
   pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "ERRORS", 0, Lifetime::Timeframe}, errors);
 
   // RS this is a hack to be removed once we have correct propagation of the firstTForbit by the framework
