remove intermediate dependence on DataOriginCLB

Author: wiechula

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

@@ -27,16 +27,15 @@
 
 #include "CommonUtils/MemFileHelper.h"
 #include "Headers/DataHeader.h"
-#include "DetectorsCalibration/Utils.h"
 
 #include "TPCBase/CDBInterface.h"
 #include "TPCCalibration/CalibPedestal.h"
 #include "TPCReconstruction/RawReaderCRU.h"
 #include "TPCWorkflow/CalibProcessingHelper.h"
 
 using namespace o2::framework;
+using o2::header::gDataOriginTPC;
 using namespace o2::tpc;
-using clbUtils = o2::calibration::Utils;
 
 namespace o2
 {
@@ -146,8 +145,8 @@ class TPCCalibPedestalDevice : public o2::framework::Task
       int type = int(dataType[i]);
 
       header::DataHeader::SubSpecificationType subSpec{(header::DataHeader::SubSpecificationType)((mLane << 4) + i)};
-      output.snapshot(Output{clbUtils::gDataOriginCLB, "TPCCLBPART", subSpec}, *image.get());
-      output.snapshot(Output{clbUtils::gDataOriginCLB, "TPCCLBPARTINFO", subSpec}, type);
+      output.snapshot(Output{gDataOriginTPC, "CLBPART", subSpec}, *image.get());
+      output.snapshot(Output{gDataOriginTPC, "CLBPARTINFO", subSpec}, type);
     }
   }
 
@@ -165,8 +164,8 @@ class TPCCalibPedestalDevice : public o2::framework::Task
 DataProcessorSpec getTPCCalibPedestalSpec(const std::string inputSpec, uint32_t ilane = 0, std::vector<int> sectors = {}, uint32_t publishAfterTFs = 0)
 {
   std::vector<o2::framework::OutputSpec> outputs;
-  outputs.emplace_back(ConcreteDataTypeMatcher{clbUtils::gDataOriginCLB, "TPCCLBPART"});
-  outputs.emplace_back(ConcreteDataTypeMatcher{clbUtils::gDataOriginCLB, "TPCCLBPARTINFO"});
+  outputs.emplace_back(ConcreteDataTypeMatcher{gDataOriginTPC, "CLBPART"});
+  outputs.emplace_back(ConcreteDataTypeMatcher{gDataOriginTPC, "CLBPARTINFO"});
 
   const auto id = fmt::format("calib-tpc-pedestal-{:02}", ilane);
   return DataProcessorSpec{

Detectors/TPC/workflow/src/CalDetMergerPublisherSpec.cxx

@@ -40,6 +40,7 @@
 using namespace o2::framework;
 using namespace o2::tpc;
 using clbUtils = o2::calibration::Utils;
+using o2::header::gDataOriginTPC;
 
 class CalDetMergerPublisherSpec : public o2::framework::Task
 {
@@ -174,8 +175,8 @@ o2::framework::DataProcessorSpec o2::tpc::getCalDetMergerPublisherSpec(uint32_t
   }
 
   std::vector<InputSpec> inputs;
-  inputs.emplace_back("clbPayload", ConcreteDataTypeMatcher{clbUtils::gDataOriginCLB, "TPCCLBPART"});
-  inputs.emplace_back("clbInfo", ConcreteDataTypeMatcher{clbUtils::gDataOriginCLB, "TPCCLBPARTINFO"});
+  inputs.emplace_back("clbPayload", ConcreteDataTypeMatcher{gDataOriginTPC, "CLBPART"});
+  inputs.emplace_back("clbInfo", ConcreteDataTypeMatcher{gDataOriginTPC, "CLBPARTINFO"});
 
   const std::string id = "calib-tpc-caldet-merger-publisher";