Merge 0e15090 into sapling-pr-archive-ktf

Author: ktf

DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOF.h

@@ -41,6 +41,12 @@ class MatchInfoTOF
   void setChi2(float chi2) { mChi2 = chi2; }
   float getChi2() const { return mChi2; }
 
+  void setHitPatternUpDown(bool v) { mHitUpDown = v; }
+  bool getHitPatternUpDown() const { return mHitUpDown; }
+
+  void setHitPatternLeftRight(bool v) { mHitLeftRight = v; }
+  bool getHitPatternLeftRight() const { return mHitLeftRight; }
+
   o2::track::TrackLTIntegral& getLTIntegralOut() { return mIntLT; }
   const o2::track::TrackLTIntegral& getLTIntegralOut() const { return mIntLT; }
   void print() const;
@@ -76,8 +82,11 @@ class MatchInfoTOF
   double mSignal = 0.0;              ///< TOF time in ps
   float mVz = 0.0;                   ///< Vz from TOF match
   int mChannel = -1;                 ///< channel
+  // Hit pattern information
+  bool mHitUpDown = false;    ///< hit pattern in TOF up-down
+  bool mHitLeftRight = false; ///< hit pattern in TOF left-right
 
-  ClassDefNV(MatchInfoTOF, 6);
+  ClassDefNV(MatchInfoTOF, 7);
 };
 } // namespace dataformats
 } // namespace o2

Detectors/GlobalTracking/src/MatchTOF.cxx

@@ -1556,7 +1556,7 @@ void MatchTOF::BestMatches(std::vector<o2::dataformats::MatchInfoTOFReco>& match
   int i = 0;
 
   // then we take discard the pairs if their track or cluster was already matched (since they are ordered in chi2, we will take the best matching)
-  for (const o2::dataformats::MatchInfoTOFReco& matchingPair : matchedTracksPairs) {
+  for (o2::dataformats::MatchInfoTOFReco& matchingPair : matchedTracksPairs) {
     int trkType = (int)matchingPair.getTrackType();
 
     int itrk = matchingPair.getIdLocal();
@@ -1610,6 +1610,24 @@ void MatchTOF::BestMatches(std::vector<o2::dataformats::MatchInfoTOFReco>& match
     matchedTracksIndex[trkType][itrk] = matchedTracks[trkTypeSplitted].size();              // index of the MatchInfoTOF correspoding to this track
     matchedClustersIndex[matchingPair.getTOFClIndex()] = matchedTracksIndex[trkType][itrk]; // index of the track that was matched to this cluster
 
+    // let's check if cluster has multiple-hits (noferini)
+    if (TOFClusWork[matchingPair.getTOFClIndex()].getNumOfContributingChannels() > 1) {
+      const auto& tofcl = TOFClusWork[matchingPair.getTOFClIndex()];
+      // has an additional hit Up or Down (Z-dir)
+      matchingPair.setHitPatternUpDown(tofcl.isAdditionalChannelSet(o2::tof::Cluster::kUp) ||
+                                       tofcl.isAdditionalChannelSet(o2::tof::Cluster::kUpLeft) ||
+                                       tofcl.isAdditionalChannelSet(o2::tof::Cluster::kUpRight) ||
+                                       tofcl.isAdditionalChannelSet(o2::tof::Cluster::kDown) ||
+                                       tofcl.isAdditionalChannelSet(o2::tof::Cluster::kDownLeft) ||
+                                       tofcl.isAdditionalChannelSet(o2::tof::Cluster::kDownRight));
+      // has an additional hit Left or Right (X-dir)
+      matchingPair.setHitPatternLeftRight(tofcl.isAdditionalChannelSet(o2::tof::Cluster::kLeft) ||
+                                          tofcl.isAdditionalChannelSet(o2::tof::Cluster::kDownLeft) ||
+                                          tofcl.isAdditionalChannelSet(o2::tof::Cluster::kUpLeft) ||
+                                          tofcl.isAdditionalChannelSet(o2::tof::Cluster::kRight) ||
+                                          tofcl.isAdditionalChannelSet(o2::tof::Cluster::kDownRight) ||
+                                          tofcl.isAdditionalChannelSet(o2::tof::Cluster::kUpRight));
+    }
     matchedTracks[trkTypeSplitted].push_back(matchingPair); // array of MatchInfoTOF
 
     // get fit info

Detectors/GlobalTrackingWorkflow/src/ReaderDriverSpec.cxx

@@ -75,7 +75,7 @@ void ReadeDriverSpec::run(ProcessingContext& pc)
     LOGP(debug, "OUTVEC {}/{}", v.back().getMin().asString(), v.back().getMax().asString());
   }
   count++;
-  if ((HBFINI::LastIRFrameIndex == -1 && count == mNTF) || (v.size() && v.back().isLast())) {
+  if ((HBFINI::LastIRFrameIndex == -1 && count >= mNTF) || (v.size() && v.back().isLast())) {
     pc.services().get<ControlService>().endOfStream();
     pc.services().get<ControlService>().readyToQuit(QuitRequest::Me);
   }

Detectors/Raw/src/HBFUtilsInitializer.cxx

@@ -58,13 +58,15 @@ HBFUtilsInitializer::HBFUtilsInitializer(const o2f::ConfigContext& configcontext
       bool helpasked = configcontext.helpOnCommandLine(); // if help is asked, don't take for granted that the ini file is there, don't produce an error if it is not!
       auto conf = configcontext.options().isSet(HBFConfOpt) ? configcontext.options().get<std::string>(HBFConfOpt) : "";
       if (!conf.empty()) {
+        int nopts = 0;
         auto vopts = o2::utils::Str::tokenize(conf, ',');
         for (const auto& optStr : vopts) {
           if (optStr == UpstreamOpt) {
             upstream = true;
             continue;
           }
           HBFOpt opt = getOptType(optStr);
+          nopts++;
           if ((opt == HBFOpt::INI || opt == HBFOpt::JSON) && !helpasked) {
             o2::conf::ConfigurableParam::updateFromFile(optStr, "HBFUtils", true); // update only those values which were not touched yet (provenance == kCODE)
             const auto& hbfu = o2::raw::HBFUtils::Instance();
@@ -76,8 +78,13 @@ HBFUtilsInitializer::HBFUtilsInitializer(const o2f::ConfigContext& configcontext
             hbfuInput = optStr;
           } else if (opt == HBFOpt::ROOT) {
             rootFileInput = optStr;
+          } else {
+            LOGP(fatal, "uknown hbfutils-config option {}", optStr);
           }
         }
+        if (!nopts && !helpasked) {
+          LOGP(fatal, "No source was provided for timing input of --hbfutils-config");
+        }
       }
       done = true;
       /* RSS

EventVisualisation/Base/CMakeLists.txt

@@ -17,9 +17,12 @@ o2_add_library(EventVisualisationBase
                        src/GeometryManager.cxx
                        src/FileWatcher.cxx
                        src/DirectoryLoader.cxx
-
+                       src/EveConfParam.cxx
         PUBLIC_LINK_LIBRARIES ROOT::Eve
                                      O2::CCDB
                                      O2::EventVisualisationDataConverter
                                      O2::DetectorsBase
 )
+
+o2_target_root_dictionary(EventVisualisationBase
+                          HEADERS include/EventVisualisationBase/EveConfParam.h)

EventVisualisation/Base/include/EventVisualisationBase/EveConfParam.h

@@ -0,0 +1,48 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#ifndef ALICE_O2_EVENTVISUALISATION_CONFIG_H
+#define ALICE_O2_EVENTVISUALISATION_CONFIG_H
+#include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/ConfigurableParamHelper.h"
+
+namespace o2::event_visualisation
+{
+struct EveConfParam : o2::conf::ConfigurableParamHelper<EveConfParam> {
+  float EMCCellTimeMax = 100.f;  // Max. EMCAL cell time (in ns)
+  float EMCCellEnergyMin = 0.3f; // Min. EMCAL cell energy (in GeV)
+
+  float timeMinMax[2] = {-999.f, -999.f}; // if min<max (microseconds), show only track in this range of every TF
+
+  int maxFiles = 150;     // maximum number of json files in folder
+  int maxTracks = -1;     // maximum number of track stored in json file (-1 means no limit)
+  int maxBytes = 3000000; // number of bytes stored in time interval which stops producing new data file (-1 means no limit)
+
+  int maxPVs = -1;                              // if > 0: enable PV mode and limit max number of vertices
+  int minTracks = -1;                           // don't create file if less than the specified number of all tracks is present
+  int minITSTracks = -1;                        // don't create file if less than the specified number of ITS tracks is present
+  int onlyNthEvent = -1;                        // process only every nth event (if > 1)
+  float PVXYZMin[3] = {-999.f, -999.f, -999.f}; // primary vertex min x,y,z
+  float PVXYZMax[3] = {999.f, 999.f, 999.f};    // primary vertex max x,y,z
+  float TPCOnlyMaxDCARZ[2] = {-999.f, -999.f};  // max DCA r,z (if positive) for TPC only tracks in the primary vertex mode
+  float TPCEtaAbsMax = -1.f;                    // if positive, show TPC tracks only below this abs eta
+
+  bool PVMode = false;         // produce jsons with individual primary vertices, not total time frame data
+  bool PVTriggersMode = false; // instead of drawing vertices with tracks (and maybe calorimeter triggers), draw vertices with calorimeter triggers (and maybe tracks)"
+  bool trackSorting = false;   // sort track by track time before applying filters
+  bool filterITSROF = false;   // don't display tracks outside ITS readout frame
+  bool calibrateEMC = true;    // apply on-the-fly EMCAL calibration
+
+  O2ParamDef(EveConfParam, "eveconf");
+};
+} // namespace o2::event_visualisation
+
+#endif

EventVisualisation/Base/src/EveConfParam.cxx

@@ -0,0 +1,14 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#include "EventVisualisationBase/EveConfParam.h"
+
+O2ParamImpl(o2::event_visualisation::EveConfParam);

EventVisualisation/Base/src/EventVisualisationBaseLinkDef.h

@@ -0,0 +1,22 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#ifdef __CLING__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class o2::event_visualisation::EveConfParam + ;
+
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::event_visualisation::EveConfParam> + ;
+
+#endif

EventVisualisation/Workflow/include/EveWorkflow/EveWorkflowHelper.h

@@ -29,6 +29,7 @@
 #include "ITSBase/GeometryTGeo.h"
 #include "TPCFastTransform.h"
 #include "TPCReconstruction/TPCFastTransformHelperO2.h"
+#include "DataFormatsTPC/VDriftCorrFact.h"
 #include "Framework/AnalysisDataModel.h"
 #include "DetectorsVertexing/PVertexerParams.h"
 
@@ -124,27 +125,17 @@ class EveWorkflowHelper
 
   using AODMFTTracks = aod::MFTTracks;
   using AODMFTTrack = AODMFTTracks::iterator;
-
-  enum Filter : uint8_t {
-    ITSROF,
-    TimeBracket,
-    EtaBracket,
-    TotalNTracks,
-    NFilters
-  };
-
-  using FilterSet = std::bitset<Filter::NFilters>;
-
   using Bracket = o2::math_utils::Bracketf_t;
 
-  EveWorkflowHelper(const FilterSet& enabledFilters = {}, std::size_t maxNTracks = -1, const Bracket& timeBracket = {}, const Bracket& etaBracket = {}, bool primaryVertexMode = false);
+  EveWorkflowHelper();
   static std::vector<PNT> getTrackPoints(const o2::track::TrackPar& trc, float minR, float maxR, float maxStep, float minZ = -25000, float maxZ = 25000);
+  void setTPCVDrift(const o2::tpc::VDriftCorrFact* v);
   void selectTracks(const CalibObjectsConst* calib, GID::mask_t maskCl, GID::mask_t maskTrk, GID::mask_t maskMatch);
   void selectTowers();
   void setITSROFs();
   void addTrackToEvent(const o2::track::TrackPar& tr, GID gid, float trackTime, float dz, GID::Source source = GID::NSources, float maxStep = 4.f);
   void draw(std::size_t primaryVertexIdx, bool sortTracks);
-  void drawTPC(GID gid, float trackTime);
+  void drawTPC(GID gid, float trackTime, float dz = 0.f);
   void drawITS(GID gid, float trackTime);
   void drawMFT(GID gid, float trackTime);
   void drawMCH(GID gid, float trackTime);
@@ -170,7 +161,7 @@ class EveWorkflowHelper
   void drawMFTTrack(GID gid, o2::track::TrackParFwd track, float trackTime);
   void drawForwardTrack(GID gid, mch::TrackParam track, float startZ, float endZ, float trackTime);
   void drawITSClusters(GID gid);
-  void drawTPCClusters(GID gid);
+  void drawTPCClusters(GID gid, float trackTimeTB = -2.e9); // if trackTimeTB<-1.e9, then use tpcTrack.getTime0()
   void drawMFTClusters(GID gid);
   void drawMCHClusters(GID gid);
   void drawMIDClusters(GID gid);
@@ -194,17 +185,14 @@ class EveWorkflowHelper
 
   void save(const std::string& jsonPath, const std::string& ext, int numberOfFiles);
 
-  FilterSet mEnabledFilters;
-  std::size_t mMaxNTracks;
-  Bracket mTimeBracket;
-  Bracket mEtaBracket;
-  bool mPrimaryVertexMode;
+  bool mUseTimeBracket = false;
+  bool mUseEtaBracketTPC = false;
+  Bracket mTimeBracket{};
+  Bracket mEtaBracketTPC;
   const o2::globaltracking::RecoContainer* mRecoCont = nullptr;
   const o2::globaltracking::RecoContainer* getRecoContainer() const { return mRecoCont; }
   void setRecoContainer(const o2::globaltracking::RecoContainer* rc) { mRecoCont = rc; }
   void setEMCALCellRecalibrator(o2::emcal::CellRecalibrator* calibrator) { mEMCALCalib = calibrator; }
-  void setMaxEMCALCellTime(float maxtime) { mEMCALMaxCellTime = maxtime; }
-  void setMinEMCALCellEnergy(float minenergy) { mEMCALMinCellEnergy = minenergy; }
   TracksSet mTrackSet;
   o2::event_visualisation::VisualisationEvent mEvent;
   std::unordered_map<GID, std::size_t> mTotalDataTypes;
@@ -220,13 +208,12 @@ class EveWorkflowHelper
   o2::phos::Geometry* mPHOSGeom;
   o2::emcal::Geometry* mEMCALGeom;
   o2::emcal::CellRecalibrator* mEMCALCalib = nullptr;
-
-  float mMUS2TPCTimeBins = 5.0098627;
+  const o2::tpc::VDriftCorrFact* mTPCVDrift = nullptr;
+  float mMUS2TPCTimeBins = 5.0098627f;
+  float mTPCTimeBins2MUS = 0.199606f;
   float mITSROFrameLengthMUS = 0; ///< ITS RO frame in mus
   float mMFTROFrameLengthMUS = 0; ///< MFT RO frame in mus
   float mTPCBin2MUS = 0;
-  float mEMCALMaxCellTime = 100.;  ///< EMCAL cell time cut (in ns)
-  float mEMCALMinCellEnergy = 0.3; ///< EMCAL cell energy cut (in GeV)
   static int BCDiffErrCount;
   const o2::vertexing::PVertexerParams* mPVParams = nullptr;
 };