Skip to content

Commit c70e17e

Browse files
matthias-kleinermatthias-kleiner
committed
Replace CorrectionMapsGloOpts with bool
1 parent 66cba90 commit c70e17e

12 files changed

Lines changed: 19 additions & 36 deletions

File tree

‎Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/TOFMatcherSpec.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@ using namespace o2::framework;
2121

2222
namespace o2
2323
{
24-
namespace tpc
25-
{
26-
struct CorrectionMapsGloOpts;
27-
}
2824
namespace globaltracking
2925
{
3026

3127
/// create a processor spec
32-
framework::DataProcessorSpec getTOFMatcherSpec(o2::dataformats::GlobalTrackID::mask_t src, bool useMC, bool useFIT, bool tpcRefit, bool strict, float extratolerancetrd, bool pushMatchable, const o2::tpc::CorrectionMapsGloOpts& sclOpts, int nlanes = 1);
28+
framework::DataProcessorSpec getTOFMatcherSpec(o2::dataformats::GlobalTrackID::mask_t src, bool useMC, bool useFIT, bool tpcRefit, bool strict, float extratolerancetrd, bool pushMatchable, bool requestCTPLumi, int nlanes = 1);
3329

3430
} // namespace globaltracking
3531
} // namespace o2

‎Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/TPCITSMatchingSpec.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@ using namespace o2::framework;
2020

2121
namespace o2
2222
{
23-
namespace tpc
24-
{
25-
struct CorrectionMapsGloOpts;
26-
}
2723
namespace globaltracking
2824
{
2925
/// create a processor spec
30-
framework::DataProcessorSpec getTPCITSMatchingSpec(o2::dataformats::GlobalTrackID::mask_t src, bool useFT0, bool calib, bool skipTPCOnly, bool useGeom, bool useMC, const o2::tpc::CorrectionMapsGloOpts& sclOpts);
26+
framework::DataProcessorSpec getTPCITSMatchingSpec(o2::dataformats::GlobalTrackID::mask_t src, bool useFT0, bool calib, bool skipTPCOnly, bool useGeom, bool useMC, bool requestCTPLumi);
3127

3228
} // namespace globaltracking
3329
} // namespace o2

‎Detectors/GlobalTrackingWorkflow/src/TOFMatcherSpec.cxx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "Framework/DeviceSpec.h"
2626
#include "TPCCalibration/VDriftHelper.h"
2727
#include "TPCFastTransformPOD.h"
28-
#include "TPCCalibration/CorrectionMapsOptions.h"
2928

3029
// from Tracks
3130
#include "ReconstructionDataFormats/GlobalTrackID.h"
@@ -232,7 +231,7 @@ void TOFMatcherSpec::endOfStream(EndOfStreamContext& ec)
232231
mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
233232
}
234233

235-
DataProcessorSpec getTOFMatcherSpec(GID::mask_t src, bool useMC, bool useFIT, bool tpcRefit, bool strict, float extratolerancetrd, bool pushMatchable, const o2::tpc::CorrectionMapsGloOpts& sclOpts, int nlanes)
234+
DataProcessorSpec getTOFMatcherSpec(GID::mask_t src, bool useMC, bool useFIT, bool tpcRefit, bool strict, float extratolerancetrd, bool pushMatchable, bool requestCTPLumi, int nlanes)
236235
{
237236
uint32_t ss = o2::globaltracking::getSubSpec(strict ? o2::globaltracking::MatchingType::Strict : o2::globaltracking::MatchingType::Standard);
238237
Options opts;
@@ -259,7 +258,7 @@ DataProcessorSpec getTOFMatcherSpec(GID::mask_t src, bool useMC, bool useFIT, bo
259258
true);
260259
o2::tpc::VDriftHelper::requestCCDBInputs(dataRequest->inputs);
261260
dataRequest->inputs.emplace_back("corrMap", o2::header::gDataOriginTPC, "TPCCORRMAP", 0, Lifetime::Timeframe);
262-
if(sclOpts.requestCTPLumi) {
261+
if(requestCTPLumi) {
263262
dataRequest->inputs.emplace_back("lumiCTP", o2::header::gDataOriginCTP, "LUMICTP", 0, Lifetime::Timeframe);
264263
}
265264
std::vector<OutputSpec> outputs;
@@ -315,7 +314,7 @@ DataProcessorSpec getTOFMatcherSpec(GID::mask_t src, bool useMC, bool useFIT, bo
315314
"tof-matcher",
316315
dataRequest->inputs,
317316
outputs,
318-
AlgorithmSpec{adaptFromTask<TOFMatcherSpec>(dataRequest, ggRequest, useMC, useFIT, tpcRefit, strict, pushMatchable, nlanes, sclOpts.requestCTPLumi)},
317+
AlgorithmSpec{adaptFromTask<TOFMatcherSpec>(dataRequest, ggRequest, useMC, useFIT, tpcRefit, strict, pushMatchable, nlanes, requestCTPLumi)},
319318
opts};
320319
}
321320

‎Detectors/GlobalTrackingWorkflow/src/TPCITSMatchingSpec.cxx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#include "DetectorsBase/GRPGeomHelper.h"
5252
#include "TPCCalibration/VDriftHelper.h"
5353
#include "TPCFastTransformPOD.h"
54-
#include "TPCCalibration/CorrectionMapsOptions.h"
5554

5655
#ifdef ENABLE_UPGRADES
5756
#include "ITS3Reconstruction/TopologyDictionary.h"
@@ -236,7 +235,7 @@ void TPCITSMatchingDPL::updateTimeDependentParams(ProcessingContext& pc)
236235
}
237236
}
238237

239-
DataProcessorSpec getTPCITSMatchingSpec(GTrackID::mask_t src, bool useFT0, bool calib, bool skipTPCOnly, bool useGeom, bool useMC, const o2::tpc::CorrectionMapsGloOpts& sclOpts)
238+
DataProcessorSpec getTPCITSMatchingSpec(GTrackID::mask_t src, bool useFT0, bool calib, bool skipTPCOnly, bool useGeom, bool useMC, bool requestCTPLumi)
240239
{
241240
std::vector<OutputSpec> outputs;
242241
auto dataRequest = std::make_shared<DataRequest>();
@@ -293,14 +292,14 @@ DataProcessorSpec getTPCITSMatchingSpec(GTrackID::mask_t src, bool useFT0, bool
293292

294293
o2::tpc::VDriftHelper::requestCCDBInputs(dataRequest->inputs);
295294
dataRequest->inputs.emplace_back("corrMap", o2::header::gDataOriginTPC, "TPCCORRMAP", 0, Lifetime::Timeframe);
296-
if(sclOpts.requestCTPLumi) {
295+
if(requestCTPLumi) {
297296
dataRequest->inputs.emplace_back("lumiCTP", o2::header::gDataOriginCTP, "LUMICTP", 0, Lifetime::Timeframe);
298297
}
299298
return DataProcessorSpec{
300299
"itstpc-track-matcher",
301300
dataRequest->inputs,
302301
outputs,
303-
AlgorithmSpec{adaptFromTask<TPCITSMatchingDPL>(dataRequest, ggRequest, useFT0, calib, skipTPCOnly, useMC, sclOpts.requestCTPLumi)},
302+
AlgorithmSpec{adaptFromTask<TPCITSMatchingDPL>(dataRequest, ggRequest, useFT0, calib, skipTPCOnly, useMC, requestCTPLumi)},
304303
opts};
305304
}
306305

‎Detectors/GlobalTrackingWorkflow/src/tof-matcher-workflow.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
171171
if (!configcontext.options().get<bool>("disable-root-input")) {
172172
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
173173
}
174-
specs.emplace_back(o2::globaltracking::getTOFMatcherSpec(src, useMC, useFIT, refitTPCTOF, strict, extratolerancetrd, writeMatchable, sclOpt, nLanes)); // doTPCrefit not yet supported (need to load TPC clusters?)
174+
specs.emplace_back(o2::globaltracking::getTOFMatcherSpec(src, useMC, useFIT, refitTPCTOF, strict, extratolerancetrd, writeMatchable, sclOpt.requestCTPLumi, nLanes)); // doTPCrefit not yet supported (need to load TPC clusters?)
175175

176176
if (!disableRootOut) {
177177
std::vector<DataProcessorSpec> writers;

‎Detectors/GlobalTrackingWorkflow/src/tpcits-match-workflow.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& configcont
9393
if (!configcontext.options().get<bool>("disable-root-input")) {
9494
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
9595
}
96-
specs.emplace_back(o2::globaltracking::getTPCITSMatchingSpec(srcL, useFT0, calib, !GID::includesSource(GID::TPC, src), useGeom, useMC, sclOpt));
96+
specs.emplace_back(o2::globaltracking::getTPCITSMatchingSpec(srcL, useFT0, calib, !GID::includesSource(GID::TPC, src), useGeom, useMC, sclOpt.requestCTPLumi));
9797

9898
if (!configcontext.options().get<bool>("disable-root-output")) {
9999
specs.emplace_back(o2::globaltracking::getTrackWriterTPCITSSpec(useMC));

‎Detectors/TRD/workflow/include/TRDWorkflow/TRDGlobalTrackingSpec.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545

4646
namespace o2
4747
{
48-
namespace tpc
49-
{
50-
struct CorrectionMapsGloOpts;
51-
}
5248
namespace trd
5349
{
5450

@@ -114,7 +110,7 @@ class TRDGlobalTracking : public o2::framework::Task
114110
};
115111

116112
/// create a processor spec
117-
framework::DataProcessorSpec getTRDGlobalTrackingSpec(bool useMC, o2::dataformats::GlobalTrackID::mask_t src, bool trigRecFilterActive, bool strict /* = false*/, bool withPID /* = false*/, PIDPolicy policy /* = PIDPolicy::DEFAULT*/, const o2::tpc::CorrectionMapsGloOpts& sclOpts);
113+
framework::DataProcessorSpec getTRDGlobalTrackingSpec(bool useMC, o2::dataformats::GlobalTrackID::mask_t src, bool trigRecFilterActive, bool strict /* = false*/, bool withPID /* = false*/, PIDPolicy policy /* = PIDPolicy::DEFAULT*/, bool requestCTPLumi);
118114

119115
} // namespace trd
120116
} // namespace o2

‎Detectors/TRD/workflow/src/TRDGlobalTrackingSpec.cxx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "DataFormatsTRD/TriggerRecord.h"
2525
#include "DataFormatsTRD/Constants.h"
2626
#include "TPCBase/ParameterElectronics.h"
27-
#include "TPCCalibration/CorrectionMapsOptions.h"
2827
#include "DataFormatsTRD/RecoInputContainer.h"
2928
#include "GPUWorkflowHelper/GPUWorkflowHelper.h"
3029
#include "Framework/ConfigParamRegistry.h"
@@ -854,7 +853,7 @@ void TRDGlobalTracking::endOfStream(EndOfStreamContext& ec)
854853
mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
855854
}
856855

857-
DataProcessorSpec getTRDGlobalTrackingSpec(bool useMC, GTrackID::mask_t src, bool trigRecFilterActive, bool strict, bool withPID, PIDPolicy policy, const o2::tpc::CorrectionMapsGloOpts& sclOpts)
856+
DataProcessorSpec getTRDGlobalTrackingSpec(bool useMC, GTrackID::mask_t src, bool trigRecFilterActive, bool strict, bool withPID, PIDPolicy policy, bool requestCTPLumi)
858857
{
859858
std::vector<OutputSpec> outputs;
860859
uint32_t ss = o2::globaltracking::getSubSpec(strict ? o2::globaltracking::MatchingType::Strict : o2::globaltracking::MatchingType::Standard);
@@ -894,7 +893,7 @@ DataProcessorSpec getTRDGlobalTrackingSpec(bool useMC, GTrackID::mask_t src, boo
894893

895894
dataRequest->inputs.emplace_back("corrMap", o2::header::gDataOriginTPC, "TPCCORRMAP", 0, Lifetime::Timeframe);
896895

897-
if(sclOpts.requestCTPLumi) {
896+
if(requestCTPLumi) {
898897
dataRequest->inputs.emplace_back("lumiCTP", o2::header::gDataOriginCTP, "LUMICTP", 0, Lifetime::Timeframe);
899898
}
900899

@@ -959,7 +958,7 @@ DataProcessorSpec getTRDGlobalTrackingSpec(bool useMC, GTrackID::mask_t src, boo
959958
processorName,
960959
inputs,
961960
outputs,
962-
AlgorithmSpec{adaptFromTask<TRDGlobalTracking>(useMC, withPID, policy, dataRequest, ggRequest, src, trigRecFilterActive, strict, sclOpts.requestCTPLumi)},
961+
AlgorithmSpec{adaptFromTask<TRDGlobalTracking>(useMC, withPID, policy, dataRequest, ggRequest, src, trigRecFilterActive, strict, requestCTPLumi)},
963962
opts};
964963
}
965964

‎Detectors/TRD/workflow/src/trd-tracking-workflow.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
116116
if (!configcontext.options().get<bool>("disable-root-input")) {
117117
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
118118
}
119-
specs.emplace_back(o2::trd::getTRDGlobalTrackingSpec(useMC, srcTRD, trigRecFilterActive, strict, pid, policy, sclOpt));
119+
specs.emplace_back(o2::trd::getTRDGlobalTrackingSpec(useMC, srcTRD, trigRecFilterActive, strict, pid, policy, sclOpt.requestCTPLumi));
120120
if (vdexb || gain) {
121121
specs.emplace_back(o2::trd::getTRDTrackBasedCalibSpec(srcTRD, vdexb, gain));
122122
}

‎GPU/Workflow/src/GPUWorkflowSpec.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
#include "TPCBase/Utils.h"
6363
#include "TPCBaseRecSim/CDBInterface.h"
6464
#include "TPCCalibration/VDriftHelper.h"
65-
#include "TPCCalibration/CorrectionMapsOptions.h"
6665
#include "TPCBaseRecSim/DeadChannelMapCreator.h"
6766
#include "SimulationDataFormat/ConstMCTruthContainer.h"
6867
#include "SimulationDataFormat/MCCompLabel.h"

0 commit comments

Comments
 (0)