adding MC ccdb objects for simulation and reconstruction

Author: alcaliva

Detectors/TPC/base/include/TPCBase/ParameterGas.h

@@ -39,6 +39,8 @@ struct ParameterGas : public o2::conf::ConfigurableParamHelper<ParameterGas> {
   float Nprim = 14.f;                                                                    ///< Number of primary electrons per MIP and cm [1/cm]
   float ScaleFactorG4 = 0.85f;                                                           ///< Scale factor to tune WION for GEANT4
   float FanoFactorG4 = 0.7f;                                                             ///< Parameter for smearing the number of ionizations (nel) using GEANT4
+  float Pressure = 1013.25f;                                                             ///< Pressure [mbar]
+  float Temperature = 20.0f;                                                             ///< Temperature [°C]
   float BetheBlochParam[5] = {0.820172e-1f, 9.94795f, 8.97292e-05f, 2.05873f, 1.65272f}; ///< Parametrization of Bethe-Bloch
 
   O2ParamDef(ParameterGas, "TPCGasParam");

Detectors/TPC/workflow/src/tpc-reco-workflow.cxx

@@ -35,14 +35,15 @@
 #include <stdexcept>
 #include <unordered_map>
 #include <regex>
+#include <cstdint>
 
 // we need a global variable to propagate the type the message dispatching of the
 // publisher will trigger on. This is dependent on the input type
 static o2::framework::Output gDispatchTrigger{"", ""};
 
 // Global variable used to transport data to the completion policy
 static o2::tpc::reco_workflow::CompletionPolicyData gPolicyData;
-static unsigned long gTpcSectorMask = 0xFFFFFFFFF;
+static uint64_t gTpcSectorMask = 0xFFFFFFFFF;
 
 void customize(std::vector<o2::framework::CallbacksPolicy>& policies)
 {

GPU/Workflow/include/GPUWorkflow/GPUWorkflowSpec.h

@@ -34,7 +34,7 @@ class TStopwatch;
 namespace fair::mq
 {
 struct RegionInfo;
-enum class State : int;
+enum class State : int32_t;
 } // namespace fair::mq
 namespace o2
 {
@@ -58,9 +58,8 @@ class GeometryFlat;
 
 namespace its
 {
-class Tracker;
-class Vertexer;
 class TimeFrame;
+class ITSTrackingInterface;
 } // namespace its
 
 namespace itsmft
@@ -102,8 +101,8 @@ class GPURecoWorkflowSpec : public o2::framework::Task
   using CompletionPolicyData = std::vector<framework::InputSpec>;
 
   struct Config {
-    int itsTriggerType = 0;
-    int lumiScaleMode = 0;
+    int32_t itsTriggerType = 0;
+    int32_t lumiScaleMode = 0;
     bool enableMShape = false;
     bool enableCTPLumi = false;
     int32_t enableDoublePipeline = 0;
@@ -126,21 +125,20 @@ class GPURecoWorkflowSpec : public o2::framework::Task
     bool runTPCTracking = false;
     bool runTRDTracking = false;
     bool readTRDtracklets = false;
-    int lumiScaleType = 0; // 0=off, 1=CTP, 2=TPC scalers
+    int32_t lumiScaleType = 0; // 0=off, 1=CTP, 2=TPC scalers
     bool outputErrorQA = false;
     bool runITSTracking = false;
-    int itsTrackingMode = 0; // 0=sync, 1=async, 2=cosmics
     bool itsOverrBeamEst = false;
     bool tpcTriggerHandling = false;
   };
 
-  GPURecoWorkflowSpec(CompletionPolicyData* policyData, Config const& specconfig, std::vector<int> const& tpcsectors, unsigned long tpcSectorMask, std::shared_ptr<o2::base::GRPGeomRequest>& ggr, std::function<bool(o2::framework::DataProcessingHeader::StartTime)>** gPolicyOrder = nullptr);
+  GPURecoWorkflowSpec(CompletionPolicyData* policyData, Config const& specconfig, std::vector<int32_t> const& tpcsectors, uint64_t tpcSectorMask, std::shared_ptr<o2::base::GRPGeomRequest>& ggr, std::function<bool(o2::framework::DataProcessingHeader::StartTime)>** gPolicyOrder = nullptr);
   ~GPURecoWorkflowSpec() override;
   void init(o2::framework::InitContext& ic) final;
   void run(o2::framework::ProcessingContext& pc) final;
   void endOfStream(o2::framework::EndOfStreamContext& ec) final;
-  void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj) final;
   void stop() final;
+  void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj) final;
   o2::framework::Inputs inputs();
   o2::framework::Outputs outputs();
   o2::framework::Options options();
@@ -177,14 +175,15 @@ class GPURecoWorkflowSpec : public o2::framework::Task
   template <class D, class E, class F, class G, class H, class I, class J, class K>
   void processInputs(o2::framework::ProcessingContext&, D&, E&, F&, G&, bool&, H&, I&, J&, K&);
 
-  int runMain(o2::framework::ProcessingContext* pc, GPUTrackingInOutPointers* ptrs, GPUInterfaceOutputs* outputRegions, int threadIndex = 0, GPUInterfaceInputUpdate* inputUpdateCallback = nullptr);
-  int runITSTracking(o2::framework::ProcessingContext& pc);
+  int32_t runMain(o2::framework::ProcessingContext* pc, GPUTrackingInOutPointers* ptrs, GPUInterfaceOutputs* outputRegions, int32_t threadIndex = 0, GPUInterfaceInputUpdate* inputUpdateCallback = nullptr);
+  int32_t runITSTracking(o2::framework::ProcessingContext& pc);
 
-  int handlePipeline(o2::framework::ProcessingContext& pc, GPUTrackingInOutPointers& ptrs, gpurecoworkflow_internals::GPURecoWorkflowSpec_TPCZSBuffers& tpcZSmeta, o2::gpu::GPUTrackingInOutZS& tpcZS, std::unique_ptr<gpurecoworkflow_internals::GPURecoWorkflow_QueueObject>& context);
+  int32_t handlePipeline(o2::framework::ProcessingContext& pc, GPUTrackingInOutPointers& ptrs, gpurecoworkflow_internals::GPURecoWorkflowSpec_TPCZSBuffers& tpcZSmeta, o2::gpu::GPUTrackingInOutZS& tpcZS, std::unique_ptr<gpurecoworkflow_internals::GPURecoWorkflow_QueueObject>& context);
   void RunReceiveThread();
-  void RunWorkerThread(int id);
+  void RunWorkerThread(int32_t id);
   void ExitPipeline();
   void handlePipelineEndOfStream(o2::framework::EndOfStreamContext& ec);
+  void handlePipelineStop();
   void initPipeline(o2::framework::InitContext& ic);
   void enqueuePipelinedJob(GPUTrackingInOutPointers* ptrs, GPUInterfaceOutputs* outputRegions, gpurecoworkflow_internals::GPURecoWorkflow_QueueObject* context, bool inputFinal);
   void finalizeInputPipelinedJob(GPUTrackingInOutPointers* ptrs, GPUInterfaceOutputs* outputRegions, gpurecoworkflow_internals::GPURecoWorkflow_QueueObject* context);
@@ -206,24 +205,23 @@ class GPURecoWorkflowSpec : public o2::framework::Task
   std::unique_ptr<GPUO2InterfaceConfiguration> mConfig;
   std::unique_ptr<GPUSettingsO2> mConfParam;
   std::unique_ptr<TStopwatch> mTimer;
-  std::vector<std::array<unsigned int, 4>> mErrorQA;
-  int mQATaskMask = 0;
+  std::vector<std::array<uint32_t, 4>> mErrorQA;
+  int32_t mQATaskMask = 0;
   std::unique_ptr<GPUO2InterfaceQA> mQA;
-  std::vector<int> mClusterOutputIds;
-  std::vector<int> mTPCSectors;
-  std::unique_ptr<o2::its::Tracker> mITSTracker;
-  std::unique_ptr<o2::its::Vertexer> mITSVertexer;
+  std::vector<int32_t> mClusterOutputIds;
+  std::vector<int32_t> mTPCSectors;
+  std::unique_ptr<o2::its::ITSTrackingInterface> mITSTrackingInterface;
   std::unique_ptr<gpurecoworkflow_internals::GPURecoWorkflowSpec_PipelineInternals> mPipeline;
   o2::its::TimeFrame* mITSTimeFrame = nullptr;
   std::vector<fair::mq::RegionInfo> mRegionInfos;
   const o2::itsmft::TopologyDictionary* mITSDict = nullptr;
   const o2::dataformats::MeanVertexObject* mMeanVertex;
-  unsigned long mTPCSectorMask = 0;
-  long mCreationForCalib = -1; ///< creation time for calib manipulation
-  int mVerbosity = 0;
-  unsigned int mNTFs = 0;
-  unsigned int mNDebugDumps = 0;
-  unsigned int mNextThreadIndex = 0;
+  uint64_t mTPCSectorMask = 0;
+  int64_t mCreationForCalib = -1; ///< creation time for calib manipulation
+  int32_t mVerbosity = 0;
+  uint32_t mNTFs = 0;
+  uint32_t mNDebugDumps = 0;
+  uint32_t mNextThreadIndex = 0;
   bool mUpdateGainMapCCDB = true;
   std::unique_ptr<o2::gpu::GPUSettingsTF> mTFSettings;
   Config mSpecConfig;
@@ -235,8 +233,6 @@ class GPURecoWorkflowSpec : public o2::framework::Task
   bool mITSGeometryCreated = false;
   bool mTRDGeometryCreated = false;
   bool mPropagatorInstanceCreated = false;
-  bool mITSRunVertexer = false;
-  bool mITSCosmicsProcessing = false;
 };
 
 } // end namespace gpu