Fixing module numbering; adjust cell address; handling pedestal runs

Dmitri Peresunko · shahor02 · commit 157977f39d50 · 2021-02-02T10:09:31.000+01:00
diff --git a/DataFormats/Detectors/PHOS/include/DataFormatsPHOS/Cell.h b/DataFormats/Detectors/PHOS/include/DataFormatsPHOS/Cell.h
@@ -25,7 +25,8 @@ namespace o2
 namespace phos
 {
 
-constexpr int kNmaxCell = 12545;        //56*64*3.5 + 1
+constexpr int kOffset = 1792;           // offset due to missing half of module 1: 56*32
+constexpr int kNmaxCell = 14337;        //56*64*4 + 1 - kOffset
 constexpr float kEnergyConv = 0.005;    //Energy digitization step
 constexpr float kTimeAccuracy = 0.3e-9; //Time digitization step
 constexpr float kTime0 = 150.e-9;       //-Minimal time to be digitized
diff --git a/DataFormats/Detectors/PHOS/src/Cell.cxx b/DataFormats/Detectors/PHOS/src/Cell.cxx
@@ -15,7 +15,7 @@
 using namespace o2::phos;
 
 // split 40 bits as following:
-// 14 bits: address, normal cells. starting from NmaxCell=3.5*56*64+1=12 544 will be TRU cells (3 136 addresses)
+// 14 bits: address, normal cells. starting from NmaxCell=3.5*56*64+1=14 337 will be TRU cells (3 136 addresses)
 // 10 bits: time
 // 15 bits: Energy
 // 1 bit:    High/low gain
@@ -35,20 +35,18 @@ Cell::Cell(short absId, float energy, float time, ChannelType_t ctype)
 void Cell::setAbsId(short absId)
 {
   //14 bits available
-  if (absId > kNmaxCell || absId < 0) {
+  if (absId > kNmaxCell || absId < kOffset) {
     absId = kNmaxCell;
   }
-  ULong_t t = (ULong_t)absId;
+  ULong_t t = (ULong_t)(absId - kOffset);
 
   ULong_t b = getLong() & 0xffffffc000; // 1111 1111 1111 1111 1111 1111 1100 0000 0000 0000
   mBits = b + t;
 }
 void Cell::setTRUId(short absId)
 {
   //14 bits available
-  absId += kNmaxCell + 1;
-  //  if (absId > kNmaxCell || absId < 0)
-  //    absId = kNmaxCell;
+  absId += kNmaxCell - kOffset + 1;
   ULong_t t = (ULong_t)absId;
 
   ULong_t b = getLong() & 0xffffffc000; // 1111 1111 1111 1111 1111 1111 1100 0000 0000 0000
@@ -58,7 +56,7 @@ void Cell::setTRUId(short absId)
 short Cell::getAbsId() const
 {
   ULong_t t = getLong() & 0x3fff; //14 bits
-  short a = (short)t;
+  short a = kOffset + (short)t;
   if (a <= kNmaxCell) {
     return a;
   } else {
@@ -69,7 +67,7 @@ short Cell::getAbsId() const
 short Cell::getTRUId() const
 {
   ULong_t t = getLong() & 0x3fff; //14 bits
-  short a = (short)t;
+  short a = kOffset + (short)t;
   if (a > kNmaxCell) {
     return a - kNmaxCell - 1;
   } else {
@@ -182,7 +180,7 @@ Bool_t Cell::getTRU() const
 {
   ULong_t t = getLong();
   t &= 0x3fff; //14 bits
-  int a = (int)t;
+  int a = kOffset + (int)t;
   return (a > kNmaxCell); //TRU addresses
 }
 
diff --git a/DataFormats/Detectors/PHOS/test/testCell.cxx b/DataFormats/Detectors/PHOS/test/testCell.cxx
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(Cell_test)
 {
   Cell c;
   c.setTime(0.);
-  for (short j = 0; j < 12544; j++) {
+  for (short j = 1793; j < 14337; j++) {
     c.setAbsId(j);
     BOOST_CHECK_EQUAL(c.getAbsId(), j);
     BOOST_CHECK_EQUAL(c.getTRUId(), 0);
@@ -47,12 +47,12 @@ BOOST_AUTO_TEST_CASE(Cell_test)
     BOOST_CHECK_EQUAL(c.getTRU(), true);
   }
 
-  c.setAbsId(0);
+  c.setAbsId(1793);
   std::vector<float> times = {-150.e-9, -10.5e-9, -0.55e-9, 0.35e-9, 2.1e-9, 3.2e-9, 4.e-9, 5.e-9, 6.e-9, 7.e-9, 8.e-9, 9.e-9, 10.e-9, 20.e-9, 50.e-9, 100.e-9, 150.e-9};
 
   for (float t : times) {
     c.setTime(t);
-    BOOST_CHECK_EQUAL(c.getAbsId(), 0);
+    BOOST_CHECK_EQUAL(c.getAbsId(), 1793);
     BOOST_CHECK_SMALL(c.getTime() - t, kTimeAccuracy);
     BOOST_CHECK_SMALL(c.getEnergy() - float(0), kEnergyConv);
     BOOST_CHECK_EQUAL(c.getLowGain(), true);
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE(Cell_test)
 
   for (float e : energies) {
     c.setEnergy(e);
-    BOOST_CHECK_EQUAL(c.getAbsId(), 0);
+    BOOST_CHECK_EQUAL(c.getAbsId(), 1793);
     BOOST_CHECK_SMALL(c.getTime() - float(0.), kTimeAccuracy);
     BOOST_CHECK_SMALL(e - c.getEnergy(), kEnergyConv); // Require 5 MeV resolution
     BOOST_CHECK_EQUAL(c.getLowGain(), true);
@@ -72,15 +72,15 @@ BOOST_AUTO_TEST_CASE(Cell_test)
   c.setEnergy(0);
 
   c.setLowGain();
-  BOOST_CHECK_EQUAL(c.getAbsId(), 0);
+  BOOST_CHECK_EQUAL(c.getAbsId(), 1793);
   BOOST_CHECK_SMALL(c.getTime() - float(0.), kTimeAccuracy);
   BOOST_CHECK_SMALL(c.getEnergy() - float(0), kEnergyConv);
   BOOST_CHECK_EQUAL(c.getLowGain(), true);
   BOOST_CHECK_EQUAL(c.getHighGain(), false);
   BOOST_CHECK_EQUAL(c.getTRU(), false);
 
   c.setHighGain();
-  BOOST_CHECK_EQUAL(c.getAbsId(), 0);
+  BOOST_CHECK_EQUAL(c.getAbsId(), 1793);
   BOOST_CHECK_SMALL(c.getTime() - float(0.), kTimeAccuracy);
   BOOST_CHECK_SMALL(c.getEnergy() - float(0), kEnergyConv);
   BOOST_CHECK_EQUAL(c.getLowGain(), false);
diff --git a/Detectors/PHOS/base/files/alignment.root b/Detectors/PHOS/base/files/alignment.root
diff --git a/Detectors/PHOS/base/src/Geometry.cxx b/Detectors/PHOS/base/src/Geometry.cxx
@@ -20,11 +20,11 @@ ClassImp(Geometry);
 // module numbering:
 //  start from module 0 (non-existing), 1 (half-module), 2 (bottom),... 4(highest)
 // absId:
-// start from 1 till 5*64*56. Numbering in each module starts at bottom left and first go in z direction:
+// start from 1 till 4*64*56. Numbering in each module starts at bottom left and first go in z direction:
 //  56   112   3584
 //  ...  ...    ...
 //  1    57 ...3529
-//  relid[3]: (module number[0...4], iphi[1...64], iz[1...56])
+//  relid[3]: (module number[0...3], iphi[1...64], iz[1...56])
 
 // these initialisations are needed for a singleton
 Geometry* Geometry::sGeom = nullptr;
@@ -131,8 +131,8 @@ void Geometry::absIdToRelPosInModule(short absId, float& x, float& z)
   char relid[3];
   absToRelNumbering(absId, relid);
 
-  x = (relid[1] - 28 - 0.5) * cellStep;
-  z = (relid[2] - 32 - 0.5) * cellStep;
+  x = (relid[1] - 32 - 0.5) * cellStep;
+  z = (relid[2] - 28 - 0.5) * cellStep;
 }
 bool Geometry::relToAbsNumbering(const char* relId, short& absId)
 {
@@ -151,7 +151,7 @@ void Geometry::relPosToAbsId(char module, float x, float z, short& absId)
 {
   const float cellStep = 2.25;
 
-  char relid[3] = {module, char(x / cellStep + 28.5), char(z / cellStep + 32.5)};
+  char relid[3] = {module, static_cast<char>(ceil(x / cellStep + 32.5)), static_cast<char>(ceil(z / cellStep + 28.5))};
   relToAbsNumbering(relid, absId);
 }
 
diff --git a/Detectors/PHOS/base/src/Mapping.cxx b/Detectors/PHOS/base/src/Mapping.cxx
@@ -119,7 +119,6 @@ Mapping::ErrorStatus Mapping::setMapping()
         LOG(FATAL) << "Maximal HW address in file " << maxHWAddress << "larger than array size " << NMaxHWAddress << "for /Mod" << m << "RCU" << i << ".data is wrong: no maxHWAddress";
         return kNotInitialized;
       }
-
       for (short ich = 0; ich < numberOfChannels; ich++) { // 1792 = 2*896 channels connected to each RCU
         int hwAddress;
         if (!(*fIn >> hwAddress)) {
@@ -152,7 +151,7 @@ Mapping::ErrorStatus Mapping::setMapping()
         //  relid[2] = Column number inside a PHOS module (Z coordinate)
         short ddl = 4 * m + i - 2;
 
-        char relid[3] = {(char)m, (char)row, (char)col};
+        char relid[3] = {static_cast<char>(m), static_cast<char>(row + 1), static_cast<char>(col + 1)};
         short absId;
         geom->relToAbsNumbering(relid, absId);
 
@@ -163,7 +162,6 @@ Mapping::ErrorStatus Mapping::setMapping()
 
         mAbsId[ddl][hwAddress] = absId;
         mCaloFlag[ddl][hwAddress] = (CaloFlag)caloFlag;
-
         mAbsToHW[absId][caloFlag][0] = ddl;
         mAbsToHW[absId][caloFlag][1] = hwAddress;
       }
diff --git a/Detectors/PHOS/calib/include/PHOSCalib/BadChannelMap.h b/Detectors/PHOS/calib/include/PHOSCalib/BadChannelMap.h
@@ -132,7 +132,7 @@ class BadChannelMap
 
  private:
   static constexpr short NCHANNELS = 14337; ///< Number of channels starting from 1 (4*64*56+1
-  static constexpr short OFFSET = 5377;     ///< Non-existing channels 56*64*1.5+1
+  static constexpr short OFFSET = 1793;     ///< Non-existing channels 56*64*0.5+1
   std::bitset<NCHANNELS> mBadCells;         ///< Container for bad cells, 1 means bad sell
 
   ClassDefNV(BadChannelMap, 1);
diff --git a/Detectors/PHOS/calib/include/PHOSCalib/CalibParams.h b/Detectors/PHOS/calib/include/PHOSCalib/CalibParams.h
@@ -107,7 +107,7 @@ class CalibParams
 
  private:
   static constexpr short NCHANNELS = 14337;  ///< Number of channels starting from 1
-  static constexpr short OFFSET = 5377;      ///< Non-existing channels 56*64*1.5+1
+  static constexpr short OFFSET = 1793;      ///< Non-existing channels 56*64*0.5+1
   std::array<float, NCHANNELS> mGainCalib;   ///< Container for the gain calibration coefficients
   std::array<float, NCHANNELS> mHGLGRatio;   ///< Container for the High Gain to Low Gain ratios
   std::array<float, NCHANNELS> mHGTimeCalib; ///< Container for the High Gain time calibration coefficients
diff --git a/Detectors/PHOS/calib/include/PHOSCalib/Pedestals.h b/Detectors/PHOS/calib/include/PHOSCalib/Pedestals.h
@@ -83,7 +83,7 @@ class Pedestals
 
  private:
   static constexpr short NCHANNELS = 14337;          ///< Number of channels starting from 1
-  static constexpr short OFFSET = 5377;              ///< Non-existing channels 56*64*1.5+1
+  static constexpr short OFFSET = 1793;              ///< Non-existing channels 56*64*1.5+1
   std::array<unsigned char, NCHANNELS> mHGPedestals; ///< Container for pedestals
   std::array<unsigned char, NCHANNELS> mLGPedestals; ///< Container for pedestals
 
diff --git a/Detectors/PHOS/reconstruction/include/PHOSReconstruction/Clusterer.h b/Detectors/PHOS/reconstruction/include/PHOSReconstruction/Clusterer.h
@@ -74,8 +74,8 @@ class Clusterer
 
  protected:
   Geometry* mPHOSGeom = nullptr;             ///< PHOS geometry
-  const CalibParams* mCalibParams = nullptr; //! Calibration coefficients
-  const BadChannelMap* mBadMap = nullptr;    //! Calibration coefficients
+  std::unique_ptr<CalibParams> mCalibParams; ///! Calibration coefficients
+  std::unique_ptr<BadChannelMap> mBadMap;    ///! Bad map
 
   std::vector<FullCluster> mClusters; ///< internal vector of clusters
   int mFirstDigitInEvent;             ///< Range of digits from one event
diff --git a/Detectors/PHOS/reconstruction/src/CaloRawFitter.cxx b/Detectors/PHOS/reconstruction/src/CaloRawFitter.cxx
@@ -40,16 +40,17 @@ CaloRawFitter::FitStatus CaloRawFitter::evaluate(const std::vector<Bunch>& bunch
         rms += a * a;
         ++nPed;
       }
-      if (nPed > 0) {
-        mean /= nPed;
-        rms = rms / nPed - mean * mean;
-        if (rms > 0.) {
-          rms = sqrt(rms);
-        }
+    }
+    if (nPed > 0) {
+      mean /= nPed;
+      rms = rms / nPed - mean * mean;
+      if (rms > 0.) {
+        rms = sqrt(rms);
       }
     }
     mAmp.push_back(mean);
     mTime.push_back(rms);
+    mOverflow.push_back(false);
     mStatus = kOK;
     return kOK;
   }
diff --git a/Detectors/PHOS/reconstruction/src/Clusterer.cxx b/Detectors/PHOS/reconstruction/src/Clusterer.cxx
@@ -55,23 +55,23 @@ void Clusterer::process(gsl::span<const Digit> digits, gsl::span<const TriggerRe
 
     if (!mBadMap) {
       if (o2::phos::PHOSSimParams::Instance().mCCDBPath.compare("localtest") == 0) {
-        mBadMap = new BadChannelMap(1);    // test default map
-        mCalibParams = new CalibParams(1); //test calibration map
+        mBadMap.reset(new BadChannelMap(1));    // test default map
+        mCalibParams.reset(new CalibParams(1)); //test calibration map
         LOG(INFO) << "No reading BadMap/Calibration from ccdb requested, set default";
       } else {
         LOG(INFO) << "Getting BadMap object from ccdb";
         o2::ccdb::CcdbApi ccdb;
         std::map<std::string, std::string> metadata; // do we want to store any meta data?
         ccdb.init("http://ccdb-test.cern.ch:8080");  // or http://localhost:8080 for a local installation
         long bcTime = 1;                             //TODO!!! Convert BC time to time o2::InteractionRecord bcTime = digitsTR.front().getBCData() ;
-        mBadMap = ccdb.retrieveFromTFileAny<o2::phos::BadChannelMap>("PHOS/BadMap", metadata, bcTime);
-        mCalibParams = ccdb.retrieveFromTFileAny<o2::phos::CalibParams>("PHOS/Calib", metadata, bcTime);
-        if (!mBadMap) {
-          LOG(FATAL) << "[PHOSCellConverter - run] can not get Bad Map";
-        }
-        if (!mCalibParams) {
-          LOG(FATAL) << "[PHOSCellConverter - run] can not get CalibParams";
-        }
+        // mBadMap = ccdb.retrieveFromTFileAny<o2::phos::BadChannelMap>("PHOS/BadMap", metadata, bcTime);
+        // mCalibParams = ccdb.retrieveFromTFileAny<o2::phos::CalibParams>("PHOS/Calib", metadata, bcTime);
+        // if (!mBadMap) {
+        //   LOG(FATAL) << "[PHOSCellConverter - run] can not get Bad Map";
+        // }
+        // if (!mCalibParams) {
+        //   LOG(FATAL) << "[PHOSCellConverter - run] can not get CalibParams";
+        // }
       }
     }
 
@@ -89,7 +89,7 @@ void Clusterer::process(gsl::span<const Digit> digits, gsl::span<const TriggerRe
 
     LOG(DEBUG) << "Found clusters from " << indexStart << " to " << clusters->size();
 
-    trigRec->emplace_back(tr.getBCData(), indexStart, clusters->size());
+    trigRec->emplace_back(tr.getBCData(), indexStart, clusters->size() - indexStart);
   }
 }
 //____________________________________________________________________________
@@ -111,33 +111,30 @@ void Clusterer::processCells(gsl::span<const Cell> cells, gsl::span<const Trigge
 
     LOG(DEBUG) << "Starting clusteriztion cells from " << mFirstDigitInEvent << " to " << mLastDigitInEvent;
 
-    if (!mBadMap) {
+    if (mBadMap.get() == nullptr) {
       if (o2::phos::PHOSSimParams::Instance().mCCDBPath.compare("localtest") == 0) {
-        mBadMap = new BadChannelMap(1);    // test default map
-        mCalibParams = new CalibParams(1); //test calibration map
+        mBadMap.reset(new BadChannelMap(1));    // test default map
+        mCalibParams.reset(new CalibParams(1)); //test calibration map
         LOG(INFO) << "No reading BadMap/Calibration from ccdb requested, set default";
       } else {
-        LOG(INFO) << "Getting BadMap object from ccdb";
-        o2::ccdb::CcdbApi ccdb;
-        std::map<std::string, std::string> metadata; // do we want to store any meta data?
-        ccdb.init("http://ccdb-test.cern.ch:8080");  // or http://localhost:8080 for a local installation
-        long bcTime = 1;                             //TODO!!! Convert BC time to time o2::InteractionRecord bcTime = digitsTR.front().getBCData() ;
-        mBadMap = ccdb.retrieveFromTFileAny<o2::phos::BadChannelMap>("PHOS/BadMap", metadata, bcTime);
-        mCalibParams = ccdb.retrieveFromTFileAny<o2::phos::CalibParams>("PHOS/Calib", metadata, bcTime);
-        if (!mBadMap) {
-          LOG(FATAL) << "[PHOSCellConverter - run] can not get Bad Map";
-        }
-        if (!mCalibParams) {
-          LOG(FATAL) << "[PHOSCellConverter - run] can not get CalibParams";
-        }
+        //   LOG(INFO) << "Getting BadMap object from ccdb";
+        //   o2::ccdb::CcdbApi ccdb;
+        //   std::map<std::string, std::string> metadata; // do we want to store any meta data?
+        //   ccdb.init("http://ccdb-test.cern.ch:8080");  // or http://localhost:8080 for a local installation
+        //   // long bcTime = 1;                             //TODO!!! Convert BC time to time o2::InteractionRecord bcTime = digitsTR.front().getBCData() ;
+        //   // mBadMap = ccdb.retrieveFromTFileAny<o2::phos::BadChannelMap>("PHOS/BadMap", metadata, bcTime);
+        //   // mCalibParams = ccdb.retrieveFromTFileAny<o2::phos::CalibParams>("PHOS/Calib", metadata, bcTime);
+        //   // if (!mBadMap) {
+        //   //   LOG(FATAL) << "[PHOSCellConverter - run] can not get Bad Map";
+        //   // }
+        //   // if (!mCalibParams) {
+        //   //   LOG(FATAL) << "[PHOSCellConverter - run] can not get CalibParams";
+        //   // }
       }
     }
-
     convertCellsToDigits(cells, firstCellInEvent, lastCellInEvent, mcmap);
-
     // Collect digits to clusters
     makeClusters(mDigits);
-
     // Unfold overlapped clusters
     // Split clusters with several local maxima if necessary
     if (o2::phos::PHOSSimParams::Instance().mUnfoldClusters) {
@@ -149,7 +146,7 @@ void Clusterer::processCells(gsl::span<const Cell> cells, gsl::span<const Trigge
 
     LOG(DEBUG) << "Found clusters from " << indexStart << " to " << clusters->size();
 
-    trigRec->emplace_back(tr.getBCData(), indexStart, clusters->size());
+    trigRec->emplace_back(tr.getBCData(), indexStart, clusters->size() - indexStart);
   }
 }
 //____________________________________________________________________________
@@ -160,25 +157,25 @@ void Clusterer::convertCellsToDigits(gsl::span<const Cell> cells, int firstCellI
   if (mDigits.capacity() < lastCellInEvent - firstCellInEvent) {
     mDigits.reserve(lastCellInEvent - firstCellInEvent);
   }
-  int iLab = 0, nLab = mcmap.size();
-  while (iLab < nLab) {
-    if (mcmap[iLab] >= firstCellInEvent) {
-      break;
-    }
-    ++iLab;
-  }
+  // int iLab = 0, nLab = mcmap.size();
+  // while (iLab < nLab) {
+  //   if (mcmap[iLab] >= firstCellInEvent) {
+  //     break;
+  //   }
+  //   ++iLab;
+  // }
 
   for (int i = firstCellInEvent; i < lastCellInEvent; i++) {
     const Cell c = cells[i];
     //short cell, float amplitude, float time, int label
     int label = -1;
-    if (mcmap[iLab] == i) {
-      label = iLab;
-      ++iLab;
-      if (iLab >= nLab) {
-        --iLab;
-      }
-    }
+    // if (mcmap[iLab] == i) {
+    //   label = iLab;
+    //   ++iLab;
+    //   if (iLab >= nLab) {
+    //     --iLab;
+    //   }
+    // }
     mDigits.emplace_back(c.getAbsId(), c.getEnergy(), c.getTime(), label);
     mDigits.back().setHighGain(c.getHighGain());
   }
diff --git a/Detectors/PHOS/simulation/src/Detector.cxx b/Detectors/PHOS/simulation/src/Detector.cxx
@@ -175,7 +175,7 @@ Bool_t Detector::ProcessHits(FairVolume* v)
   fMC->CurrentVolOffID(3, strip); // 3: number of geom levels between PXTL and strip: get strip number in PHOS module
   Int_t cell;
   fMC->CurrentVolOffID(2, cell); // 2: number of geom levels between PXTL and cell: get sell in strip number.
-  Int_t detID = Geometry::relToAbsId(moduleNumber, strip, cell);
+  Int_t detID = Geometry::relToAbsId(moduleNumber - 1, strip, cell);
 
   if (superParent == mCurentSuperParent && detID == mCurrentCellID && mCurrentHit) {
     // continue with current hit
diff --git a/Detectors/PHOS/simulation/src/Digitizer.cxx b/Detectors/PHOS/simulation/src/Digitizer.cxx
diff --git a/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx b/Detectors/PHOS/workflow/src/ClusterizerSpec.cxx
diff --git a/Detectors/PHOS/workflow/src/RawToCellConverterSpec.cxx b/Detectors/PHOS/workflow/src/RawToCellConverterSpec.cxx
diff --git a/Detectors/PHOS/workflow/src/RecoWorkflow.cxx b/Detectors/PHOS/workflow/src/RecoWorkflow.cxx

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ namespace o2`
`25`	`25`	`namespace phos`
`26`	`26`	`{`
`27`	`27`
`28`		`-constexpr int kNmaxCell = 12545; //56643.5 + 1`
	`28`	`+constexpr int kOffset = 1792; // offset due to missing half of module 1: 56*32`
	`29`	`+constexpr int kNmaxCell = 14337; //56644 + 1 - kOffset`
`29`	`30`	`constexpr float kEnergyConv = 0.005; //Energy digitization step`
`30`	`31`	`constexpr float kTimeAccuracy = 0.3e-9; //Time digitization step`
`31`	`32`	`constexpr float kTime0 = 150.e-9; //-Minimal time to be digitized`