Merge 897cc11 into sapling-pr-archive-ktf

Author: ktf

DataFormats/Detectors/GlobalTracking/CMakeLists.txt

@@ -36,7 +36,7 @@ o2_add_library(
     O2::DataFormatsCPV
     O2::DataFormatsPHOS
     O2::DataFormatsEMCAL
-    O2::GPUDataTypeHeaders
+    O2::GPUDataTypes
     $<$<BOOL:${ENABLE_UPGRADES}>:O2::ITS3Reconstruction>
   PRIVATE_LINK_LIBRARIES
     O2::Framework)

Detectors/Base/CMakeLists.txt

@@ -42,7 +42,7 @@ o2_add_library(DetectorsBase
                                      O2::SimulationDataFormat
                                      O2::SimConfig
                                      O2::CCDB
-                                     O2::GPUDataTypeHeaders
+                                     O2::GPUDataTypes
                                      MC::VMC
                                      TBB::tbb
                              )

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

@@ -34,6 +34,7 @@ enum class CDBType {
   CalLaserTracks,      ///< Laser track calibration data
   CalVDriftTgl,        ///< ITS-TPC difTgl vdrift calibration
   CalTimeGain,         ///< Gain variation over time
+  CalTimeGainMC,       ///< Gain variation over time for MC
   CalGas,              ///< DCS gas measurements
   CalTemperature,      ///< DCS temperature measurements
   CalHV,               ///< DCS HV measurements
@@ -98,6 +99,7 @@ const std::unordered_map<CDBType, const std::string> CDBTypeMap{
   {CDBType::CalPadGainResidual, "TPC/Calib/PadGainResidual"},
   {CDBType::CalLaserTracks, "TPC/Calib/LaserTracks"},
   {CDBType::CalTimeGain, "TPC/Calib/TimeGain"},
+  {CDBType::CalTimeGainMC, "TPC/Calib/TimeGainMC"},
   {CDBType::CalGas, "TPC/Calib/Gas"},
   {CDBType::CalTemperature, "TPC/Calib/Temperature"},
   {CDBType::CalHV, "TPC/Calib/HV"},

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

@@ -62,6 +62,16 @@ struct ParameterGEM : public o2::conf::ConfigurableParamHelper<ParameterGEM> {
   O2ParamDef(ParameterGEM, "TPCGEMParam");
 };
 } // namespace tpc
+
+namespace framework
+{
+template <typename T>
+struct is_messageable;
+template <>
+struct is_messageable<o2::tpc::ParameterGEM> : std::true_type {
+};
+} // namespace framework
+
 } // namespace o2
 
 #endif // ALICEO2_TPC_ParameterGEM_H_

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

@@ -47,6 +47,16 @@ struct ParameterGas : public o2::conf::ConfigurableParamHelper<ParameterGas> {
 };
 
 } // namespace tpc
+
+namespace framework
+{
+template <typename T>
+struct is_messageable;
+template <>
+struct is_messageable<o2::tpc::ParameterGas> : std::true_type {
+};
+} // namespace framework
+
 } // namespace o2
 
 #endif // ALICEO2_TPC_ParameterGas_H_

Detectors/TPC/workflow/include/TPCWorkflow/RecoWorkflow.h

@@ -86,7 +86,8 @@ framework::WorkflowSpec getWorkflow(CompletionPolicyData* policyData,
                                     bool askDISTSTF = true,
                                     bool selIR = false,
                                     bool filteredInp = false,
-                                    int deadMapSources = -1);
+                                    int deadMapSources = -1,
+                                    bool useMCTimeGain = false);
 
 void cleanupCallback();
 

Detectors/TPC/workflow/src/RecoWorkflow.cxx

@@ -100,7 +100,7 @@ const std::unordered_map<std::string, OutputType> OutputMap{
 
 framework::WorkflowSpec getWorkflow(CompletionPolicyData* policyData, std::vector<int> const& tpcSectors, unsigned long tpcSectorMask, std::vector<int> const& laneConfiguration,
                                     const o2::tpc::CorrectionMapsLoaderGloOpts& sclOpts, bool propagateMC, unsigned nLanes, std::string const& cfgInput, std::string const& cfgOutput, bool disableRootInput,
-                                    int caClusterer, int zsOnTheFly, bool askDISTSTF, bool selIR, bool filteredInp, int deadMapSources)
+                                    int caClusterer, int zsOnTheFly, bool askDISTSTF, bool selIR, bool filteredInp, int deadMapSources, bool useMCTimeGain)
 {
   InputType inputType;
   try {
@@ -473,6 +473,7 @@ framework::WorkflowSpec getWorkflow(CompletionPolicyData* policyData, std::vecto
     cfg.askDISTSTF = askDISTSTF;
     cfg.tpcTriggerHandling = isEnabled(OutputType::TPCTriggers) || cfg.caClusterer;
     cfg.tpcDeadMapSources = deadMapSources;
+    cfg.tpcUseMCTimeGain = useMCTimeGain;
 
     Inputs ggInputs;
     auto ggRequest = std::make_shared<o2::base::GRPGeomRequest>(false, true, false, true, true, o2::base::GRPGeomRequest::Aligned, ggInputs, true);

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

@@ -72,6 +72,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
     {"filtered-input", VariantType::Bool, false, {"Filtered tracks, clusters input, prefix dataDescriptors with F"}},
     {"select-ir-frames", VariantType::Bool, false, {"Subscribe and filter according to external IR Frames"}},
     {"tpc-deadMap-sources", VariantType::Int, -1, {"Sources to consider for TPC dead channel map creation; -1=all, 0=deactivated"}},
+    {"tpc-mc-time-gain", VariantType::Bool, false, {"use time gain calibration for MC (true) or for data (false)"}},
   };
   o2::tpc::CorrectionMapsLoader::addGlobalOptions(options);
   o2::raw::HBFUtilsInitializer::addConfigOption(options);
@@ -185,7 +186,8 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
                                                 !cfgc.options().get<bool>("ignore-dist-stf"),      //
                                                 cfgc.options().get<bool>("select-ir-frames"),
                                                 cfgc.options().get<bool>("filtered-input"),
-                                                cfgc.options().get<int>("tpc-deadMap-sources"));
+                                                cfgc.options().get<int>("tpc-deadMap-sources"),
+                                                cfgc.options().get<bool>("tpc-mc-time-gain"));
 
   // configure dpl timer to inject correct firstTForbit: start from the 1st orbit of TF containing 1st sampled orbit
   o2::raw::HBFUtilsInitializer hbfIni(cfgc, wf);

Detectors/TRD/workflow/io/CMakeLists.txt

@@ -23,7 +23,7 @@ o2_add_library(TRDWorkflowIO
                        src/TRDCalibWriterSpec.cxx
                        src/TRDPHReaderSpec.cxx
                        include/TRDWorkflowIO/KrClusterWriterSpec.h
-               PUBLIC_LINK_LIBRARIES O2::DataFormatsTRD O2::SimulationDataFormat O2::DPLUtils O2::GPUDataTypeHeaders O2::DataFormatsTPC)
+               PUBLIC_LINK_LIBRARIES O2::DataFormatsTRD O2::SimulationDataFormat O2::DPLUtils O2::GPUDataTypes O2::DataFormatsTPC)
 
 
 o2_add_executable(digit-reader-workflow

Framework/Core/include/Framework/RootArrowFilesystem.h

@@ -87,6 +87,11 @@ class TTreeFileSystem : public VirtualRootFileSystemBase
   {
     return std::dynamic_pointer_cast<VirtualRootFileSystemBase>(shared_from_this());
   };
+
+  arrow::Result<std::shared_ptr<arrow::io::OutputStream>> OpenOutputStream(
+    const std::string& path,
+    const std::shared_ptr<const arrow::KeyValueMetadata>& metadata) override;
+
   virtual TTree* GetTree(arrow::dataset::FileSource source) = 0;
 };
 
@@ -128,6 +133,10 @@ class TFileFileSystem : public VirtualRootFileSystemBase
 
   std::shared_ptr<VirtualRootFileSystemBase> GetSubFilesystem(arrow::dataset::FileSource source) override;
 
+  arrow::Result<std::shared_ptr<arrow::io::OutputStream>> OpenOutputStream(
+    const std::string& path,
+    const std::shared_ptr<const arrow::KeyValueMetadata>& metadata) override;
+
   // We can go back to the TFile in case this is needed.
   TDirectoryFile* GetFile()
   {
@@ -218,6 +227,29 @@ class TTreeFileFormat : public arrow::dataset::FileFormat
     const std::shared_ptr<arrow::dataset::FileFragment>& fragment) const override;
 };
 
+// An arrow outputstream which allows to write to a ttree
+class TTreeOutputStream : public arrow::io::OutputStream
+{
+ public:
+  TTreeOutputStream(TTree* t);
+
+  arrow::Status Close() override;
+
+  arrow::Result<int64_t> Tell() const override;
+
+  arrow::Status Write(const void* data, int64_t nbytes) override;
+
+  bool closed() const override;
+
+  TTree* GetTree()
+  {
+    return mTree;
+  }
+
+ private:
+  TTree* mTree;
+};
+
 } // namespace o2::framework
 
 #endif // O2_FRAMEWORK_ROOT_ARROW_FILESYSTEM_H_