Change lifetime::timeframe to sporadic in several places

davidrohr · davidrohr · commit cddf0071d6ae · 2023-01-20T11:01:10.000+01:00
diff --git a/Detectors/Calibration/workflow/CCDBPopulatorSpec.h b/Detectors/Calibration/workflow/CCDBPopulatorSpec.h
@@ -149,7 +149,7 @@ namespace framework
 DataProcessorSpec getCCDBPopulatorDeviceSpec(const std::string& defCCDB, const std::string& nameExt)
 {
   using clbUtils = o2::calibration::Utils;
-  std::vector<InputSpec> inputs = {{"clbPayload", "CLP"}, {"clbWrapper", "CLW"}};
+  std::vector<InputSpec> inputs = {{"clbPayload", "CLP", Lifetime::Sporadic}, {"clbWrapper", "CLW", Lifetime::Sporadic}};
   std::string devName = "ccdb-populator";
   devName += nameExt;
   return DataProcessorSpec{
diff --git a/Detectors/TPC/workflow/include/TPCWorkflow/TPCDistributeIDCSpec.h b/Detectors/TPC/workflow/include/TPCWorkflow/TPCDistributeIDCSpec.h
@@ -69,10 +69,10 @@ class TPCDistributeIDCSpec : public o2::framework::Task
       const auto sides = IDCFactorization::getSides(mCRUs);
       for (auto side : sides) {
         const std::string name = (side == Side::A) ? "idcsgroupa" : "idcsgroupc";
-        mFilter.emplace_back(InputSpec{name.data(), ConcreteDataTypeMatcher{o2::header::gDataOriginTPC, TPCFLPIDCDevice::getDataDescriptionIDCGroup(side)}, Lifetime::Timeframe});
+        mFilter.emplace_back(InputSpec{name.data(), ConcreteDataTypeMatcher{o2::header::gDataOriginTPC, TPCFLPIDCDevice::getDataDescriptionIDCGroup(side)}, Lifetime::Sporadic});
       }
     } else {
-      mFilter.emplace_back(InputSpec{"iccs", ConcreteDataTypeMatcher{o2::header::gDataOriginTPC, TPCIntegrateClustersDevice::getDataDescription()}, Lifetime::Timeframe});
+      mFilter.emplace_back(InputSpec{"iccs", ConcreteDataTypeMatcher{o2::header::gDataOriginTPC, TPCIntegrateClustersDevice::getDataDescription()}, Lifetime::Sporadic});
     }
   };
 
diff --git a/Detectors/TPC/workflow/include/TPCWorkflow/TPCDistributeSACSpec.h b/Detectors/TPC/workflow/include/TPCWorkflow/TPCDistributeSACSpec.h
@@ -102,7 +102,7 @@ class TPCDistributeSACSpec : public o2::framework::Task
   void sendOutput(o2::framework::ProcessingContext& pc)
   {
     LOGP(info, "Sending SACs on lane: {} for {} TFs", mCurrentOutLane, mProcessedTFs);
-    pc.outputs().snapshot(Output{gDataOriginTPC, getDataDescriptionSACCCDB(), 0, Lifetime::Timeframe}, mCCDBTimeStamp);
+    pc.outputs().snapshot(Output{gDataOriginTPC, getDataDescriptionSACCCDB(), 0, Lifetime::Sporadic}, mCCDBTimeStamp);
     for (unsigned int i = 0; i < o2::tpc::GEMSTACKS; ++i) {
       pc.outputs().snapshot(Output{gDataOriginTPC, mDataDescrOut[mCurrentOutLane], header::DataHeader::SubSpecificationType{i}}, mSACs[i]);
     }
@@ -112,14 +112,14 @@ class TPCDistributeSACSpec : public o2::framework::Task
 DataProcessorSpec getTPCDistributeSACSpec(const unsigned int timeframes, const unsigned int outlanes)
 {
   std::vector<InputSpec> inputSpecs;
-  inputSpecs.emplace_back(InputSpec{"sac", gDataOriginTPC, "DECODEDSAC", 0, Lifetime::Timeframe});
-  inputSpecs.emplace_back(InputSpec{"reftime", gDataOriginTPC, "REFTIMESAC", 0, Lifetime::Timeframe});
+  inputSpecs.emplace_back(InputSpec{"sac", gDataOriginTPC, "DECODEDSAC", 0, Lifetime::Sporadic});
+  inputSpecs.emplace_back(InputSpec{"reftime", gDataOriginTPC, "REFTIMESAC", 0, Lifetime::Sporadic});
 
   std::vector<OutputSpec> outputSpecs;
   for (unsigned int lane = 0; lane < outlanes; ++lane) {
     outputSpecs.emplace_back(ConcreteDataTypeMatcher{gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACVec(lane)}, Lifetime::Sporadic);
   }
-  outputSpecs.emplace_back(gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACCCDB(), 0, Lifetime::Timeframe);
+  outputSpecs.emplace_back(gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACCCDB(), 0, Lifetime::Sporadic);
 
   return DataProcessorSpec{
     "tpc-distribute-sac",
diff --git a/Detectors/TPC/workflow/include/TPCWorkflow/TPCFactorizeSACSpec.h b/Detectors/TPC/workflow/include/TPCWorkflow/TPCFactorizeSACSpec.h
@@ -93,7 +93,7 @@ class TPCFactorizeSACSpec : public o2::framework::Task
   const bool mDebug{false};                                                                                                                                                ///< dump SACs to tree for debugging
   const int mLaneId{0};                                                                                                                                                    ///< the id of the current process within the parallel pipeline
   uint64_t mCCDBTimeStamp{0};                                                                                                                                              ///< time stamp of first SACs which are received for the current aggreagtion interval, which is used for setting the time when writing to the CCDB
-  const std::vector<InputSpec> mFilter = {{"sac", ConcreteDataTypeMatcher{gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACVec(mLaneId)}, Lifetime::Timeframe}}; ///< filter for looping over input data
+  const std::vector<InputSpec> mFilter = {{"sac", ConcreteDataTypeMatcher{gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACVec(mLaneId)}, Lifetime::Sporadic}};  ///< filter for looping over input data
 
   void sendOutput(DataAllocator& output)
   {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ namespace framework`
`149`	`149`	`DataProcessorSpec getCCDBPopulatorDeviceSpec(const std::string& defCCDB, const std::string& nameExt)`
`150`	`150`	`{`
`151`	`151`	`using clbUtils = o2::calibration::Utils;`
`152`		`- std::vector<InputSpec> inputs = {{"clbPayload", "CLP"}, {"clbWrapper", "CLW"}};`
	`152`	`+ std::vector<InputSpec> inputs = {{"clbPayload", "CLP", Lifetime::Sporadic}, {"clbWrapper", "CLW", Lifetime::Sporadic}};`
`153`	`153`	`std::string devName = "ccdb-populator";`
`154`	`154`	`devName += nameExt;`
`155`	`155`	`return DataProcessorSpec{`
Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,10 @@ class TPCDistributeIDCSpec : public o2::framework::Task`
`69`	`69`	`const auto sides = IDCFactorization::getSides(mCRUs);`
`70`	`70`	`for (auto side : sides) {`
`71`	`71`	`const std::string name = (side == Side::A) ? "idcsgroupa" : "idcsgroupc";`
`72`		`- mFilter.emplace_back(InputSpec{name.data(), ConcreteDataTypeMatcher{o2::header::gDataOriginTPC, TPCFLPIDCDevice::getDataDescriptionIDCGroup(side)}, Lifetime::Timeframe});`
	`72`	`+ mFilter.emplace_back(InputSpec{name.data(), ConcreteDataTypeMatcher{o2::header::gDataOriginTPC, TPCFLPIDCDevice::getDataDescriptionIDCGroup(side)}, Lifetime::Sporadic});`
`73`	`73`	`}`
`74`	`74`	`} else {`
`75`		`- mFilter.emplace_back(InputSpec{"iccs", ConcreteDataTypeMatcher{o2::header::gDataOriginTPC, TPCIntegrateClustersDevice::getDataDescription()}, Lifetime::Timeframe});`
	`75`	`+ mFilter.emplace_back(InputSpec{"iccs", ConcreteDataTypeMatcher{o2::header::gDataOriginTPC, TPCIntegrateClustersDevice::getDataDescription()}, Lifetime::Sporadic});`
`76`	`76`	`}`
`77`	`77`	`};`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ class TPCDistributeSACSpec : public o2::framework::Task`
`102`	`102`	`void sendOutput(o2::framework::ProcessingContext& pc)`
`103`	`103`	`{`
`104`	`104`	`LOGP(info, "Sending SACs on lane: {} for {} TFs", mCurrentOutLane, mProcessedTFs);`
`105`		`- pc.outputs().snapshot(Output{gDataOriginTPC, getDataDescriptionSACCCDB(), 0, Lifetime::Timeframe}, mCCDBTimeStamp);`
	`105`	`+ pc.outputs().snapshot(Output{gDataOriginTPC, getDataDescriptionSACCCDB(), 0, Lifetime::Sporadic}, mCCDBTimeStamp);`
`106`	`106`	`for (unsigned int i = 0; i < o2::tpc::GEMSTACKS; ++i) {`
`107`	`107`	`pc.outputs().snapshot(Output{gDataOriginTPC, mDataDescrOut[mCurrentOutLane], header::DataHeader::SubSpecificationType{i}}, mSACs[i]);`
`108`	`108`	`}`
`@@ -112,14 +112,14 @@ class TPCDistributeSACSpec : public o2::framework::Task`
`112`	`112`	`DataProcessorSpec getTPCDistributeSACSpec(const unsigned int timeframes, const unsigned int outlanes)`
`113`	`113`	`{`
`114`	`114`	`std::vector<InputSpec> inputSpecs;`
`115`		`- inputSpecs.emplace_back(InputSpec{"sac", gDataOriginTPC, "DECODEDSAC", 0, Lifetime::Timeframe});`
`116`		`- inputSpecs.emplace_back(InputSpec{"reftime", gDataOriginTPC, "REFTIMESAC", 0, Lifetime::Timeframe});`
	`115`	`+ inputSpecs.emplace_back(InputSpec{"sac", gDataOriginTPC, "DECODEDSAC", 0, Lifetime::Sporadic});`
	`116`	`+ inputSpecs.emplace_back(InputSpec{"reftime", gDataOriginTPC, "REFTIMESAC", 0, Lifetime::Sporadic});`
`117`	`117`
`118`	`118`	`std::vector<OutputSpec> outputSpecs;`
`119`	`119`	`for (unsigned int lane = 0; lane < outlanes; ++lane) {`
`120`	`120`	`outputSpecs.emplace_back(ConcreteDataTypeMatcher{gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACVec(lane)}, Lifetime::Sporadic);`
`121`	`121`	`}`
`122`		`- outputSpecs.emplace_back(gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACCCDB(), 0, Lifetime::Timeframe);`
	`122`	`+ outputSpecs.emplace_back(gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACCCDB(), 0, Lifetime::Sporadic);`
`123`	`123`
`124`	`124`	`return DataProcessorSpec{`
`125`	`125`	`"tpc-distribute-sac",`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class TPCFactorizeSACSpec : public o2::framework::Task`
`93`	`93`	`const bool mDebug{false}; ///< dump SACs to tree for debugging`
`94`	`94`	`const int mLaneId{0}; ///< the id of the current process within the parallel pipeline`
`95`	`95`	`uint64_t mCCDBTimeStamp{0}; ///< time stamp of first SACs which are received for the current aggreagtion interval, which is used for setting the time when writing to the CCDB`
`96`		`- const std::vector<InputSpec> mFilter = {{"sac", ConcreteDataTypeMatcher{gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACVec(mLaneId)}, Lifetime::Timeframe}}; ///< filter for looping over input data`
	`96`	`+ const std::vector<InputSpec> mFilter = {{"sac", ConcreteDataTypeMatcher{gDataOriginTPC, TPCDistributeSACSpec::getDataDescriptionSACVec(mLaneId)}, Lifetime::Sporadic}}; ///< filter for looping over input data`
`97`	`97`
`98`	`98`	`void sendOutput(DataAllocator& output)`
`99`	`99`	`{`