Merge 56e990d into sapling-pr-archive-ktf

Author: ktf

Detectors/EMCAL/simulation/include/EMCALSimulation/Digitizer.h

@@ -110,6 +110,9 @@ class Digitizer : public TObject
   bool mSmearEnergy = true;                                                             ///< do time and energy smearing
   bool mSimulateTimeResponse = true;                                                    ///< simulate time response
   const SimParam* mSimParam = nullptr;                                                  ///< SimParam object
+  bool mIsBeforeFirstRO = false;                                                        ///< check if the signal comes before the ROF
+  o2::InteractionRecord mIRFirstSampledTF;                                              ///< IR of the 1st sampled IR, noise-only ROFs will be inserted till this IR only
+  double mTimeBCns;                                                                     ///< time difference between bc and start of ROF in ns
 
   std::vector<Digit> mTempDigitVector;     ///< temporary digit storage
   o2::emcal::DigitsWriteoutBuffer mDigits; ///< used to sort digits and labels by tower

Detectors/EMCAL/simulation/src/Digitizer.cxx

@@ -26,6 +26,8 @@
 #include "CommonDataFormat/InteractionRecord.h"
 #include "CommonUtils/TreeStreamRedirector.h"
 #include "SimConfig/DigiParams.h"
+#include "DetectorsRaw/HBFUtilsInitializer.h"
+#include "DetectorsRaw/HBFUtils.h"
 
 ClassImp(o2::emcal::Digitizer);
 
@@ -80,6 +82,8 @@ void Digitizer::init()
   } else {
   }
 
+  mIRFirstSampledTF = o2::raw::HBFUtils::Instance().getFirstSampledTFIR();
+
   if (mEnableDebugStreaming) {
     mDebugStream = std::make_unique<o2::utils::TreeStreamRedirector>("emcaldigitsDebug.root", "RECREATE");
   }
@@ -164,6 +168,13 @@ void Digitizer::sampleSDigit(const Digit& sDigit)
     return;
   }
 
+  // check if this hit because it comes from an event before readout starts and it does not effect this RO
+  LOG(debug) << "mIsBeforeFirstRO " << mIsBeforeFirstRO << "     sDigit.getTimeStamp() " << sDigit.getTimeStamp() << "    mSimParam->getSignalDelay() " << mSimParam->getSignalDelay() << "   mPhase " << mPhase << "   total: " << sDigit.getTimeStamp() + mSimParam->getSignalDelay() + mPhase * 25 << "   EMC_TOF_MAX " << EMC_TOF_MAX << "  mTimeBCns " << mTimeBCns;
+  if (mIsBeforeFirstRO && sDigit.getTimeStamp() + mTimeBCns < 0) {
+    LOG(debug) << "disregard this hit because it comes from an event before readout starts and it does not effect this RO";
+    return;
+  }
+
   Double_t energies[15];
   if (mSimulateTimeResponse) {
     if (sDigit.getTimeStamp() + mSimParam->getSignalDelay() + mPhase * 25 > EMC_TOF_MAX) {
@@ -246,4 +257,16 @@ void Digitizer::setEventTime(o2::InteractionTimeRecord record, bool trigger)
     mPhase = 0;
     mEventTimeOffset++;
   }
+
+  // get time difference between current bc and start of RO in ns
+  auto nbc = record.differenceInBC(mIRFirstSampledTF);
+  mTimeBCns = record.getTimeOffsetWrtBC();
+  mTimeBCns += nbc * o2::constants::lhc::LHCBunchSpacingNS;
+
+  if (nbc < 0) {
+    // this event is before the first RO
+    mIsBeforeFirstRO = true;
+  } else {
+    mIsBeforeFirstRO = false;
+  }
 }

Detectors/GlobalTrackingWorkflow/study/include/GlobalTrackingStudy/TrackMCStudy.h

@@ -21,7 +21,7 @@ namespace o2::trackstudy
 {
 
 /// create a processor spec
-o2::framework::DataProcessorSpec getTrackMCStudySpec(o2::dataformats::GlobalTrackID::mask_t srcTracks, o2::dataformats::GlobalTrackID::mask_t srcClus, const o2::tpc::CorrectionMapsLoaderGloOpts& sclOpts);
+o2::framework::DataProcessorSpec getTrackMCStudySpec(o2::dataformats::GlobalTrackID::mask_t srcTracks, o2::dataformats::GlobalTrackID::mask_t srcClus, const o2::tpc::CorrectionMapsLoaderGloOpts& sclOpts, bool checkSV);
 
 } // namespace o2::trackstudy
 

Detectors/GlobalTrackingWorkflow/study/include/GlobalTrackingStudy/TrackMCStudyConfig.h

@@ -27,10 +27,9 @@ struct TrackMCStudyConfig : o2::conf::ConfigurableParamHelper<TrackMCStudyConfig
   float decayMotherMaxT = 1.0f; // max TOF in ns for mother particles to study
   bool requireITSorTPCTrackRefs = true;
   bool requireTopBottomRefs = false;
-  int minTPCRefsToExtractClRes = 4;
-  float rejectClustersResStat = 0.6;
-  float maxTPCRefExtrap = 2; // max dX to extrapolate the track ref when extrapolating track true posions
-  float maxTRefExtrapErr = 0.005;
+  int minTPCRefsToExtractClRes = 2;
+  float rejectClustersResStat = 0.;
+  float maxTPCRefExtrap = 2;                   // max dX to extrapolate the track ref when extrapolating track true posions
   int decayPDG[5] = {310, 3122, 411, 421, -1}; // decays to study, must end by -1
   O2ParamDef(TrackMCStudyConfig, "trmcconf");
 };

Detectors/GlobalTrackingWorkflow/study/include/GlobalTrackingStudy/TrackMCStudyTypes.h

@@ -20,6 +20,7 @@
 #include "CommonDataFormat/TimeStamp.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include <array>
+#include <vector>
 
 namespace o2::trackstudy
 {
@@ -39,16 +40,18 @@ struct MCTrackInfo {
   int bcInTF = -1;
   int pdg = 0;
   int pdgParent = 0;
+  int parentEntry = -1;
   int16_t nTPCCl = 0;
   int16_t nTPCClShared = 0;
+  int8_t parentDecID = -1;
   uint8_t minTPCRow = -1;
   uint8_t maxTPCRow = 0;
   uint8_t maxTPCRowInner = 0; // highest row in the sector containing the lowest one
   uint8_t minTPCRowSect = -1;
   uint8_t maxTPCRowSect = -1;
   int8_t nITSCl = 0;
   int8_t pattITSCl = 0;
-  ClassDefNV(MCTrackInfo, 2);
+  ClassDefNV(MCTrackInfo, 3);
 };
 
 struct RecTrack {
@@ -112,24 +115,20 @@ struct TrackFamily { // set of tracks related to the same MC label
   ClassDefNV(TrackFamily, 1);
 };
 
-struct ClResTPC {
-  uint8_t sect = 0;
-  uint8_t row = 0;
-  uint8_t ncont = 0;
-  uint8_t flags = 0;
-  float snp = 0;
-  float tgl = 0;
-  float qmax = 0;
-  float qtot = 0;
-  float occ = 0;
-  std::array<float, 3> clPos{};
+struct ClResTPCCont {
+  // contributor to TPC Cluster
+  std::array<float, 3> xyz{};
   std::array<float, 3> below{};
   std::array<float, 3> above{};
+  float snp = 0.;
+  float tgl = 0.;
+  float q2pt = 0.;
+  bool corrAttach = false;
 
-  int getNExt() const { return below[0] > 1. + above[0] > 1.; }
+  int getNExt() const { return (below[0] > 1.) + (above[0] > 1.); }
 
-  float getDY() const { return clPos[1] - getYRef(); }
-  float getDZ() const { return clPos[2] - getZRef(); }
+  float getDY() const { return xyz[1] - getYRef(); }
+  float getDZ() const { return xyz[2] - getZRef(); }
 
   float getYRef() const
   {
@@ -165,15 +164,62 @@ struct ClResTPC {
   {
     float adxA = 1e9, adxB = 1e9;
     if (above[0] > 1.) {
-      adxA = clPos[0] - above[0];
+      adxA = xyz[0] - above[0];
     }
     if (below[0] > 1.) {
-      adxB = clPos[0] - below[0];
+      adxB = xyz[1] - below[0];
     }
     return std::abs(adxA) < std::abs(adxB) ? adxA : adxB;
   }
 
-  ClassDefNV(ClResTPC, 1);
+  float getDXMax() const
+  {
+    float adxA = 0, adxB = 0;
+    if (above[0] > 1.) {
+      adxA = xyz[0] - above[0];
+    }
+    if (below[0] > 1.) {
+      adxB = xyz[0] - below[0];
+    }
+    return std::abs(adxA) > std::abs(adxB) ? adxA : adxB;
+  }
+
+  float getEY() const { return getNExt() > 1 ? below[1] - above[1] : -999; }
+  float getEZ() const { return getNExt() > 1 ? below[2] - above[2] : -999; }
+
+  ClassDefNV(ClResTPCCont, 1);
+};
+
+struct ClResTPC {
+  uint8_t sect = 0;
+  uint8_t row = 0;
+  uint8_t ncont = 0;
+  uint8_t flags = 0;
+  float qmax = 0;
+  float qtot = 0;
+  float occ = 0;
+
+  std::vector<ClResTPCCont> contTracks;
+  int getNCont() const { return contTracks.size(); }
+
+  float getDY(int i) const { return i < getNCont() ? contTracks[i].getDY() : -999.; }
+  float getDZ(int i) const { return i < getNCont() ? contTracks[i].getDZ() : -999.; }
+  float getYRef(int i) const { return i < getNCont() ? contTracks[i].getYRef() : -999.; }
+  float getZRef(int i) const { return i < getNCont() ? contTracks[i].getZRef() : -999.; }
+  float getDXMin(int i) const { return i < getNCont() ? contTracks[i].getDXMin() : -999.; }
+  float getDXMax(int i) const { return i < getNCont() ? contTracks[i].getDXMax() : -999.; }
+  float getEY(int i) const { return i < getNCont() ? contTracks[i].getEY() : -999.; }
+  float getEZ(int i) const { return i < getNCont() ? contTracks[i].getEZ() : -999.; }
+
+  void sortCont()
+  {
+    std::sort(contTracks.begin(), contTracks.end(), [](const ClResTPCCont& a, const ClResTPCCont& b) {
+      float dya = a.getDY(), dyb = b.getDY(), dza = a.getDZ(), dzb = b.getDZ();
+      return dya * dya + dza * dza < dyb * dyb + dzb * dzb;
+    });
+  }
+
+  ClassDefNV(ClResTPC, 2);
 };
 
 struct RecPV {

Detectors/GlobalTrackingWorkflow/study/src/GlobalTrackingStudyLinkDef.h

@@ -34,5 +34,7 @@
 #pragma link C++ class o2::trackstudy::MCVertex + ;
 #pragma link C++ class std::vector < o2::trackstudy::MCVertex> + ;
 #pragma link C++ class o2::trackstudy::ClResTPC + ;
+#pragma link C++ class o2::trackstudy::ClResTPCCont + ;
+#pragma link C++ class std::vector < o2::trackstudy::ClResTPCCont> + ;
 
 #endif