Make TPC VDrift calib. 1st slot length 30% of nominal (3min)

Author: shahor02

Detectors/TPC/calibration/include/TPCCalibration/TPCVDriftTglCalibration.h

@@ -91,10 +91,12 @@ class TPCVDriftTglCalibration : public o2::calibration::TimeSlotCalibration<TPCV
 
  public:
   TPCVDriftTglCalibration() = default;
-  TPCVDriftTglCalibration(int ntgl, float tglMax, int ndtgl, float dtglMax, uint32_t slotL, float maxDelay, size_t minEnt) : mNBinsTgl(ntgl), mMaxTgl(tglMax), mNBinsDTgl(ndtgl), mMaxDTgl(dtglMax), mMineEntriesPerSlot(minEnt)
+  TPCVDriftTglCalibration(int ntgl, float tglMax, int ndtgl, float dtglMax, uint32_t slotL, float offsetFrac, float maxDelay, size_t minEnt, float offset = 0.f)
+    : mNBinsTgl(ntgl), mMaxTgl(tglMax), mNBinsDTgl(ndtgl), mMaxDTgl(dtglMax), mMineEntriesPerSlot(minEnt)
   {
     setSlotLengthInSeconds(slotL);
     setMaxSlotsDelay(maxDelay);
+    setStartOffsetFrac(offsetFrac);
   }
 
   ~TPCVDriftTglCalibration() final = default;

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

@@ -20,7 +20,7 @@
 namespace o2::tpc
 {
 
-o2::framework::DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float maxDelay, size_t minEnt);
+o2::framework::DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float offset, float maxDelay, size_t minEnt);
 }
 
 #endif

Detectors/TPC/workflow/src/TPCVDriftTglCalibSpec.cxx

@@ -30,9 +30,9 @@ namespace tpc
 class TPCVDriftTglCalibSpec : public Task
 {
  public:
-  TPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float maxDelay, size_t minEnt, std::shared_ptr<o2::base::GRPGeomRequest> req) : mCCDBRequest(req)
+  TPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float offset, float maxDelay, size_t minEnt, std::shared_ptr<o2::base::GRPGeomRequest> req) : mCCDBRequest(req)
   {
-    mCalibrator = std::make_unique<o2::tpc::TPCVDriftTglCalibration>(ntgl, tglMax, ndtgl, dtglMax, slotL, maxDelay, minEnt);
+    mCalibrator = std::make_unique<o2::tpc::TPCVDriftTglCalibration>(ntgl, tglMax, ndtgl, dtglMax, slotL, offset, maxDelay, minEnt);
   }
 
   void init(InitContext& ic) final
@@ -113,7 +113,7 @@ void TPCVDriftTglCalibSpec::sendOutput(DataAllocator& output)
 }
 
 //_____________________________________________________________
-DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float maxDelay, size_t minEnt)
+DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float slot0frac, float maxDelay, size_t minEnt)
 {
 
   using device = o2::tpc::TPCVDriftTglCalibSpec;
@@ -132,12 +132,13 @@ DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, fl
   std::vector<OutputSpec> outputs;
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TPCVDTGL"}, Lifetime::Sporadic);
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "TPCVDTGL"}, Lifetime::Sporadic);
+  slot0frac = 1. - slot0frac;
 
   return DataProcessorSpec{
     "tpc-vd-tgl-calib",
     inputs,
     outputs,
-    AlgorithmSpec{adaptFromTask<o2::tpc::TPCVDriftTglCalibSpec>(ntgl, tglMax, ndtgl, dtglMax, slotL, maxDelay, minEnt, ccdbRequest)},
+    AlgorithmSpec{adaptFromTask<o2::tpc::TPCVDriftTglCalibSpec>(ntgl, tglMax, ndtgl, dtglMax, slotL, slot0frac, maxDelay, minEnt, ccdbRequest)},
     Options{{"vdtgl-histos-file-name", VariantType::String, "", {"file to save histos (if name provided)"}}}};
 }
 

Detectors/TPC/workflow/src/tpc-vdrift-tgl-calibration-workflow.cxx

@@ -26,6 +26,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
     {"max-dtgl-itstpc", o2::framework::VariantType::Float, 0.15f, {"max range for tgL_ITS - tgl_TPC"}},
     {"min-entries-per-slot", o2::framework::VariantType::Int, 10000, {"mininal number of entries per slot"}},
     {"time-slot-seconds", o2::framework::VariantType::Int, 600, {"time slot length in seconds"}},
+    {"first-slot-length-fraction", o2::framework::VariantType::Float, 0.3f, {"1st slot length as fraction of nominal"}},
     {"max-slots-delay", o2::framework::VariantType::Float, 0.1f, {"difference in slot units between the current TF and oldest slot (end TF) to account for the TF"}},
     {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}}};
   std::swap(workflowOptions, options);
@@ -44,6 +45,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
                                                        configcontext.options().get<int>("nbins-dtgl"),
                                                        configcontext.options().get<float>("max-dtgl-itstpc"),
                                                        configcontext.options().get<int>("time-slot-seconds"),
+                                                       configcontext.options().get<float>("first-slot-length-fraction"),
                                                        configcontext.options().get<float>("max-slots-delay"),
                                                        configcontext.options().get<int>("min-entries-per-slot")));
   return specs;