Skip to content

Commit e311d14

Browse files
committed
Make TPC VDrift calib. 1st slot length 30% of nominal (3min)
1 parent e7c79ba commit e311d14

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,12 @@ class TPCVDriftTglCalibration : public o2::calibration::TimeSlotCalibration<TPCV
9191

9292
public:
9393
TPCVDriftTglCalibration() = default;
94-
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)
94+
TPCVDriftTglCalibration(int ntgl, float tglMax, int ndtgl, float dtglMax, uint32_t slotL, float offsetFrac, float maxDelay, size_t minEnt, float offset = 0.f)
95+
: mNBinsTgl(ntgl), mMaxTgl(tglMax), mNBinsDTgl(ndtgl), mMaxDTgl(dtglMax), mMineEntriesPerSlot(minEnt)
9596
{
9697
setSlotLengthInSeconds(slotL);
9798
setMaxSlotsDelay(maxDelay);
99+
setStartOffsetFrac(offsetFrac);
98100
}
99101

100102
~TPCVDriftTglCalibration() final = default;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
namespace o2::tpc
2121
{
2222

23-
o2::framework::DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float maxDelay, size_t minEnt);
23+
o2::framework::DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float offset, float maxDelay, size_t minEnt);
2424
}
2525

2626
#endif

Detectors/TPC/workflow/src/TPCVDriftTglCalibSpec.cxx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ namespace tpc
3030
class TPCVDriftTglCalibSpec : public Task
3131
{
3232
public:
33-
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)
33+
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)
3434
{
35-
mCalibrator = std::make_unique<o2::tpc::TPCVDriftTglCalibration>(ntgl, tglMax, ndtgl, dtglMax, slotL, maxDelay, minEnt);
35+
mCalibrator = std::make_unique<o2::tpc::TPCVDriftTglCalibration>(ntgl, tglMax, ndtgl, dtglMax, slotL, offset, maxDelay, minEnt);
3636
}
3737

3838
void init(InitContext& ic) final
@@ -113,7 +113,7 @@ void TPCVDriftTglCalibSpec::sendOutput(DataAllocator& output)
113113
}
114114

115115
//_____________________________________________________________
116-
DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float maxDelay, size_t minEnt)
116+
DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, float dtglMax, size_t slotL, float slot0frac, float maxDelay, size_t minEnt)
117117
{
118118

119119
using device = o2::tpc::TPCVDriftTglCalibSpec;
@@ -132,12 +132,13 @@ DataProcessorSpec getTPCVDriftTglCalibSpec(int ntgl, float tglMax, int ndtgl, fl
132132
std::vector<OutputSpec> outputs;
133133
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TPCVDTGL"}, Lifetime::Sporadic);
134134
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "TPCVDTGL"}, Lifetime::Sporadic);
135+
slot0frac = 1. - slot0frac;
135136

136137
return DataProcessorSpec{
137138
"tpc-vd-tgl-calib",
138139
inputs,
139140
outputs,
140-
AlgorithmSpec{adaptFromTask<o2::tpc::TPCVDriftTglCalibSpec>(ntgl, tglMax, ndtgl, dtglMax, slotL, maxDelay, minEnt, ccdbRequest)},
141+
AlgorithmSpec{adaptFromTask<o2::tpc::TPCVDriftTglCalibSpec>(ntgl, tglMax, ndtgl, dtglMax, slotL, slot0frac, maxDelay, minEnt, ccdbRequest)},
141142
Options{{"vdtgl-histos-file-name", VariantType::String, "", {"file to save histos (if name provided)"}}}};
142143
}
143144

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
2626
{"max-dtgl-itstpc", o2::framework::VariantType::Float, 0.15f, {"max range for tgL_ITS - tgl_TPC"}},
2727
{"min-entries-per-slot", o2::framework::VariantType::Int, 10000, {"mininal number of entries per slot"}},
2828
{"time-slot-seconds", o2::framework::VariantType::Int, 600, {"time slot length in seconds"}},
29+
{"first-slot-length-fraction", o2::framework::VariantType::Float, 0.3f, {"1st slot length as fraction of nominal"}},
2930
{"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"}},
3031
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}}};
3132
std::swap(workflowOptions, options);
@@ -44,6 +45,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
4445
configcontext.options().get<int>("nbins-dtgl"),
4546
configcontext.options().get<float>("max-dtgl-itstpc"),
4647
configcontext.options().get<int>("time-slot-seconds"),
48+
configcontext.options().get<float>("first-slot-length-fraction"),
4749
configcontext.options().get<float>("max-slots-delay"),
4850
configcontext.options().get<int>("min-entries-per-slot")));
4951
return specs;

0 commit comments

Comments
 (0)