Skip to content

Commit ebd3382

Browse files
FIT,TOF,TPC: Fixing sporadic/timeframe lifetimes
* FIT,TOF,TPC: Changing Lifetime to sporadic for several writers * Changing Lifetime to Timeframe
1 parent 8e73925 commit ebd3382

6 files changed

Lines changed: 14 additions & 14 deletions

File tree

Detectors/FIT/workflow/include/FITWorkflow/FITIntegrateClusterSpec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ o2::framework::DataProcessorSpec getFITIntegrateClusterSpec(const bool disableWr
180180
inputs);
181181

182182
std::vector<OutputSpec> outputs;
183-
outputs.emplace_back(FitType::getDataOrigin(), FitType::getDataDescriptionFITC(), 0, Lifetime::Sporadic);
183+
outputs.emplace_back(FitType::getDataOrigin(), FitType::getDataDescriptionFITC(), 0, Lifetime::Timeframe);
184184
if (!disableWriter) {
185-
outputs.emplace_back(FitType::getDataOrigin(), FitType::getDataDescriptionFITTFId(), 0, Lifetime::Sporadic);
185+
outputs.emplace_back(FitType::getDataOrigin(), FitType::getDataDescriptionFITTFId(), 0, Lifetime::Timeframe);
186186
}
187187

188188
return DataProcessorSpec{

Detectors/FIT/workflow/include/FITWorkflow/FITIntegrateClusterWriterSpec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ DataProcessorSpec getFITIntegrateClusterWriterSpec()
3838
return MakeRootTreeWriterSpec(fmt::format("{}-currents-writer", FitType::getName()).data(),
3939
treeFile.data(),
4040
treeName.data(),
41-
BranchDefinition<typename DataDescriptionFITCurrents<DataT>::DataTStruct>{InputSpec{"ifitc", FitType::getDataOrigin(), FitType::getDataDescriptionFITC(), 0}, "IFITC", 1},
42-
BranchDefinition<o2::dataformats::TFIDInfo>{InputSpec{"tfID", FitType::getDataOrigin(), FitType::getDataDescriptionFITTFId(), 0}, "tfID", 1})();
41+
BranchDefinition<typename DataDescriptionFITCurrents<DataT>::DataTStruct>{InputSpec{"ifitc", FitType::getDataOrigin(), FitType::getDataDescriptionFITC(), 0, Lifetime::Timeframe}, "IFITC", 1},
42+
BranchDefinition<o2::dataformats::TFIDInfo>{InputSpec{"tfID", FitType::getDataOrigin(), FitType::getDataDescriptionFITTFId(), 0, Lifetime::Timeframe}, "tfID", 1})();
4343
}
4444

4545
} // end namespace fit

Detectors/TOF/workflow/src/TOFIntegrateClusterSpec.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ o2::framework::DataProcessorSpec getTOFIntegrateClusterSpec(const bool disableWr
174174
inputs);
175175

176176
std::vector<OutputSpec> outputs;
177-
outputs.emplace_back(o2::header::gDataOriginTOF, "ITOFCN", 0, Lifetime::Sporadic);
178-
outputs.emplace_back(o2::header::gDataOriginTOF, "ITOFCQ", 0, Lifetime::Sporadic);
177+
outputs.emplace_back(o2::header::gDataOriginTOF, "ITOFCN", 0, Lifetime::Timeframe);
178+
outputs.emplace_back(o2::header::gDataOriginTOF, "ITOFCQ", 0, Lifetime::Timeframe);
179179
if (!disableWriter) {
180-
outputs.emplace_back(o2::header::gDataOriginTOF, "ITOFTFID", 0, Lifetime::Sporadic);
180+
outputs.emplace_back(o2::header::gDataOriginTOF, "ITOFTFID", 0, Lifetime::Timeframe);
181181
}
182182

183183
return DataProcessorSpec{

Detectors/TOF/workflowIO/src/TOFIntegrateClusterWriterSpec.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ DataProcessorSpec getTOFIntegrateClusterWriterSpec()
3030
return MakeRootTreeWriterSpec("tof-currents-writer",
3131
"o2currents_tof.root",
3232
"itofc",
33-
BranchDefinition<std::vector<float>>{InputSpec{"itofcn", o2::header::gDataOriginTOF, "ITOFCN", 0}, "ITOFCN", 1},
34-
BranchDefinition<std::vector<float>>{InputSpec{"itofcq", o2::header::gDataOriginTOF, "ITOFCQ", 0}, "ITOFCQ", 1},
35-
BranchDefinition<o2::dataformats::TFIDInfo>{InputSpec{"itoftfid", o2::header::gDataOriginTOF, "ITOFTFID", 0}, "tfID", 1})();
33+
BranchDefinition<std::vector<float>>{InputSpec{"itofcn", o2::header::gDataOriginTOF, "ITOFCN", 0, Lifetime::Timeframe}, "ITOFCN", 1},
34+
BranchDefinition<std::vector<float>>{InputSpec{"itofcq", o2::header::gDataOriginTOF, "ITOFCQ", 0, Lifetime::Timeframe}, "ITOFCQ", 1},
35+
BranchDefinition<o2::dataformats::TFIDInfo>{InputSpec{"itoftfid", o2::header::gDataOriginTOF, "ITOFTFID", 0, Lifetime::Timeframe}, "tfID", 1})();
3636
}
3737

3838
} // namespace tof

Detectors/TPC/workflow/src/TPCIntegrateClusterSpec.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ o2::framework::DataProcessorSpec getTPCIntegrateClusterSpec(const bool disableWr
185185
inputs);
186186

187187
std::vector<OutputSpec> outputs;
188-
outputs.emplace_back(o2::header::gDataOriginTPC, getDataDescriptionTPCC(), 0, Lifetime::Sporadic);
188+
outputs.emplace_back(o2::header::gDataOriginTPC, getDataDescriptionTPCC(), 0, Lifetime::Timeframe);
189189
if (!disableWriter) {
190-
outputs.emplace_back(o2::header::gDataOriginTPC, getDataDescriptionTPCTFId(), 0, Lifetime::Sporadic);
190+
outputs.emplace_back(o2::header::gDataOriginTPC, getDataDescriptionTPCTFId(), 0, Lifetime::Timeframe);
191191
}
192192

193193
return DataProcessorSpec{

Detectors/TPC/workflow/src/TPCIntegrateClusterWriterSpec.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ DataProcessorSpec getTPCIntegrateClusterWriterSpec()
3333
return MakeRootTreeWriterSpec("tpc-currents-writer",
3434
"o2currents_tpc.root",
3535
"itpcc",
36-
BranchDefinition<ITPCC>{InputSpec{"itpcc", o2::header::gDataOriginTPC, getDataDescriptionTPCC(), 0}, "ITPCC", 1},
37-
BranchDefinition<o2::dataformats::TFIDInfo>{InputSpec{"itpctfid", o2::header::gDataOriginTPC, "ITPCTFID", 0}, "tfID", 1})();
36+
BranchDefinition<ITPCC>{InputSpec{"itpcc", o2::header::gDataOriginTPC, getDataDescriptionTPCC(), 0, Lifetime::Sporadic}, "ITPCC", 1},
37+
BranchDefinition<o2::dataformats::TFIDInfo>{InputSpec{"itpctfid", o2::header::gDataOriginTPC, "ITPCTFID", 0, Lifetime::Sporadic}, "tfID", 1})();
3838
}
3939

4040
} // namespace tpc

0 commit comments

Comments
 (0)