Skip to content

Commit 0ed8b8a

Browse files
shahor02shahor02
committed
MC->raw converters use HBFUtils settings of digitization
1 parent b3920fd commit 0ed8b8a

16 files changed

Lines changed: 80 additions & 59 deletions

File tree

‎Detectors/CPV/simulation/src/RawCreator.cxx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ int main(int argc, const char** argv)
4949
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,link");
5050
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
5151
add_option("debug,d", bpo::value<uint32_t>()->default_value(0), "Select debug output level [0 = no debug output]");
52-
//add_option("digitization-config,d", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "configKeyValues file from digitization");
53-
add_option("digitization-config,d", bpo::value<std::string>()->default_value("none"), "configKeyValues file from digitization");
52+
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
5453
add_option("configKeyValues", bpo::value<std::string>()->default_value(""), "comma-separated configKeyValues");
5554

5655
opt_all.add(opt_general).add(opt_hidden);
@@ -71,9 +70,9 @@ int main(int argc, const char** argv)
7170
exit(2);
7271
}
7372

74-
std::string confDig = vm["digitization-config"].as<std::string>();
73+
std::string confDig = vm["hbfutils-config"].as<std::string>();
7574
if (!confDig.empty() && confDig != "none") {
76-
o2::conf::ConfigurableParam::updateFromFile(confDig);
75+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
7776
}
7877
o2::conf::ConfigurableParam::updateFromString(vm["configKeyValues"].as<std::string>());
7978

@@ -112,4 +111,8 @@ int main(int argc, const char** argv)
112111
rawwriter.digitsToRaw(*digitbranch, *triggerbranch);
113112
}
114113
rawwriter.getWriter().writeConfFile("CPV", "RAWDATA", o2::utils::concat_string(outputdir, "/CPVraw.cfg"));
114+
115+
o2::raw::HBFUtils::Instance().print();
116+
117+
return 0;
115118
}

‎Detectors/EMCAL/simulation/src/RawCreator.cxx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ int main(int argc, const char** argv)
5050
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,subdet,link");
5151
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
5252
add_option("debug,d", bpo::value<uint32_t>()->default_value(0), "Select debug output level [0 = no debug output]");
53-
//add_option("digitization-config,d", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "configKeyValues file from digitization");
54-
add_option("digitization-config,d", bpo::value<std::string>()->default_value("none"), "configKeyValues file from digitization");
53+
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
5554
add_option("configKeyValues", bpo::value<std::string>()->default_value(""), "comma-separated configKeyValues");
5655

5756
opt_all.add(opt_general).add(opt_hidden);
@@ -77,9 +76,9 @@ int main(int argc, const char** argv)
7776
FairLogger::GetLogger()->SetLogScreenLevel("DEBUG");
7877
}
7978

80-
std::string confDig = vm["digitization-config"].as<std::string>();
79+
std::string confDig = vm["hbfutils-config"].as<std::string>();
8180
if (!confDig.empty() && confDig != "none") {
82-
o2::conf::ConfigurableParam::updateFromFile(confDig);
81+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
8382
}
8483
o2::conf::ConfigurableParam::updateFromString(vm["configKeyValues"].as<std::string>());
8584

@@ -123,4 +122,8 @@ int main(int argc, const char** argv)
123122
rawwriter.digitsToRaw(*digitbranch, *triggerbranch);
124123
}
125124
rawwriter.getWriter().writeConfFile("EMC", "RAWDATA", o2::utils::concat_string(outputdir, "/EMCraw.cfg"));
125+
126+
o2::raw::HBFUtils::Instance().print();
127+
128+
return 0;
126129
}

‎Detectors/FIT/FDD/simulation/src/digit2raw.cxx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ int main(int argc, char** argv)
5252
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
5353
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(defRDH), "RDH version to use");
5454
add_option("no-empty-hbf,e", bpo::value<bool>()->default_value(false)->implicit_value(true), "do not create empty HBF pages (except for HBF starting TF)");
55-
//add_option("digitization-config,d", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "configKeyValues file from digitization");
56-
add_option("digitization-config,d", bpo::value<std::string>()->default_value("none"), "configKeyValues file from digitization");
55+
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
5756
add_option("configKeyValues", bpo::value<std::string>()->default_value(""), "comma-separated configKeyValues");
5857

5958
opt_all.add(opt_general).add(opt_hidden);
@@ -75,9 +74,9 @@ int main(int argc, char** argv)
7574
exit(2);
7675
}
7776

78-
std::string confDig = vm["digitization-config"].as<std::string>();
77+
std::string confDig = vm["hbfutils-config"].as<std::string>();
7978
if (!confDig.empty() && confDig != "none") {
80-
o2::conf::ConfigurableParam::updateFromFile(confDig);
79+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
8180
}
8281
o2::conf::ConfigurableParam::updateFromString(vm["configKeyValues"].as<std::string>());
8382
digi2raw(vm["input-file"].as<std::string>(),
@@ -86,6 +85,8 @@ int main(int argc, char** argv)
8685
vm["rdh-version"].as<uint32_t>(),
8786
vm["no-empty-hbf"].as<bool>());
8887

88+
o2::raw::HBFUtils::Instance().print();
89+
8990
return 0;
9091
}
9192

‎Detectors/FIT/FT0/simulation/src/digi2raw.cxx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ int main(int argc, char** argv)
5252
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
5353
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(defRDH), "RDH version to use");
5454
add_option("no-empty-hbf,e", bpo::value<bool>()->default_value(false)->implicit_value(true), "do not create empty HBF pages (except for HBF starting TF)");
55-
//add_option("digitization-config,d", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "configKeyValues file from digitization");
56-
add_option("digitization-config,d", bpo::value<std::string>()->default_value("none"), "configKeyValues file from digitization");
55+
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
5756
add_option("configKeyValues", bpo::value<std::string>()->default_value(""), "comma-separated configKeyValues");
5857

5958
opt_all.add(opt_general).add(opt_hidden);
@@ -75,9 +74,9 @@ int main(int argc, char** argv)
7574
exit(2);
7675
}
7776

78-
std::string confDig = vm["digitization-config"].as<std::string>();
77+
std::string confDig = vm["hbfutils-config"].as<std::string>();
7978
if (!confDig.empty() && confDig != "none") {
80-
o2::conf::ConfigurableParam::updateFromFile(confDig);
79+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
8180
}
8281
o2::conf::ConfigurableParam::updateFromString(vm["configKeyValues"].as<std::string>());
8382
digi2raw(vm["input-file"].as<std::string>(),
@@ -87,6 +86,8 @@ int main(int argc, char** argv)
8786
vm["rdh-version"].as<uint32_t>(),
8887
vm["no-empty-hbf"].as<bool>());
8988

89+
o2::raw::HBFUtils::Instance().print();
90+
9091
return 0;
9192
}
9293

‎Detectors/FIT/FV0/simulation/src/digit2raw.cxx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ int main(int argc, char** argv)
5252
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
5353
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(defRDH), "RDH version to use");
5454
add_option("no-empty-hbf,e", bpo::value<bool>()->default_value(false)->implicit_value(true), "do not create empty HBF pages (except for HBF starting TF)");
55-
//add_option("digitization-config,d", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "configKeyValues file from digitization");
56-
add_option("digitization-config,d", bpo::value<std::string>()->default_value("none"), "configKeyValues file from digitization");
55+
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
5756
add_option("configKeyValues", bpo::value<std::string>()->default_value(""), "comma-separated configKeyValues");
5857

5958
opt_all.add(opt_general).add(opt_hidden);
@@ -75,9 +74,9 @@ int main(int argc, char** argv)
7574
exit(2);
7675
}
7776

78-
std::string confDig = vm["digitization-config"].as<std::string>();
77+
std::string confDig = vm["hbfutils-config"].as<std::string>();
7978
if (!confDig.empty() && confDig != "none") {
80-
o2::conf::ConfigurableParam::updateFromFile(confDig);
79+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
8180
}
8281
o2::conf::ConfigurableParam::updateFromString(vm["configKeyValues"].as<std::string>());
8382
digi2raw(vm["input-file"].as<std::string>(),
@@ -86,6 +85,8 @@ int main(int argc, char** argv)
8685
vm["rdh-version"].as<uint32_t>(),
8786
vm["no-empty-hbf"].as<bool>());
8887

88+
o2::raw::HBFUtils::Instance().print();
89+
8990
return 0;
9091
}
9192

‎Detectors/GlobalTrackingWorkflow/tofworkflow/src/tof-reco-workflow.cxx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
6060
workflowOptions.push_back(ConfigParamSpec{"disable-row-writing", o2::framework::VariantType::Bool, false, {"disable ROW in Digit writing"}});
6161
workflowOptions.push_back(ConfigParamSpec{"write-decoding-errors", o2::framework::VariantType::Bool, false, {"trace errors in digits output when decoding"}});
6262
workflowOptions.push_back(ConfigParamSpec{"calib-cluster", VariantType::Bool, false, {"to enable calib info production from clusters"}});
63-
//workflowOptions.push_back(ConfigParamSpec{"digitization-config", o2::framework::VariantType::String, {std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE), "configKeyValues file from digitization, used for raw output only!!!"}});
64-
workflowOptions.push_back(ConfigParamSpec{"digitization-config", o2::framework::VariantType::String, "none", {"configKeyValues file from digitization, used for raw output only!!!"}});
63+
workflowOptions.push_back(ConfigParamSpec{"hbfutils-config", o2::framework::VariantType::String, std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE), {"config file for HBFUtils (or none), used for raw output only!!!"}});
6564
workflowOptions.push_back(ConfigParamSpec{"cosmics", VariantType::Bool, false, {"to enable cosmics utils"}});
6665
}
6766

@@ -114,9 +113,9 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
114113
}
115114
if (outputType.rfind("raw") < outputType.size()) {
116115
writeraw = 1;
117-
std::string confDig = cfgc.options().get<std::string>("digitization-config");
116+
std::string confDig = cfgc.options().get<std::string>("hbfutils-config");
118117
if (!confDig.empty() && confDig != "none") {
119-
o2::conf::ConfigurableParam::updateFromFile(confDig);
118+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
120119
}
121120
}
122121
if (outputType.rfind("ctf") < outputType.size()) {

‎Detectors/HMPID/workflow/src/digits-to-raw-workflow.cxx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ void customize(std::vector<o2::framework::CompletionPolicy>& policies)
3939
void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4040
{
4141
std::string keyvaluehelp("Semicolon separated key=value strings ...");
42-
//workflowOptions.push_back(ConfigParamSpec{"digitization-config", o2::framework::VariantType::String, std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE), "configKeyValues file from digitization, used for raw output only!!!");
43-
workflowOptions.push_back(o2::framework::ConfigParamSpec{"digitization-config", o2::framework::VariantType::String, "none", {"configKeyValues file from digitization, used for raw output only!!!"}});
42+
workflowOptions.push_back(o2::framework::ConfigParamSpec{"hbfutils-config", o2::framework::VariantType::String, std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE), {"config file for HBFUtils (or none), used for raw output only!!!"}});
4443
workflowOptions.push_back(o2::framework::ConfigParamSpec{"configKeyValues", o2::framework::VariantType::String, "", {keyvaluehelp}});
4544
}
4645

@@ -53,9 +52,9 @@ using namespace o2::framework;
5352
WorkflowSpec defineDataProcessing(const ConfigContext& configcontext)
5453
{
5554
WorkflowSpec specs;
56-
std::string confDig = configcontext.options().get<std::string>("digitization-config");
55+
std::string confDig = configcontext.options().get<std::string>("hbfutils-config");
5756
if (!confDig.empty() && confDig != "none") {
58-
o2::conf::ConfigurableParam::updateFromFile(confDig);
57+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
5958
}
6059
o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
6160
DataProcessorSpec consumer = o2::hmpid::getDigitsToRawSpec();

‎Detectors/ITSMFT/ITS/simulation/CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ o2_data_file(COPY data DESTINATION Detectors/ITS/simulation)
2525

2626
o2_add_executable(digi2raw
2727
COMPONENT_NAME its
28+
TARGETVARNAME itsdigi2raw_exe
2829
SOURCES src/digi2raw.cxx
2930
PUBLIC_LINK_LIBRARIES O2::ITSMFTReconstruction
3031
O2::DataFormatsITSMFT
@@ -34,3 +35,9 @@ o2_add_executable(digi2raw
3435
O2::DetectorsCommonDataFormats
3536
O2::CommonUtils
3637
Boost::program_options)
38+
39+
if(NOT APPLE)
40+
41+
set_property(TARGET ${itsdigi2raw_exe} PROPERTY LINK_WHAT_YOU_USE ON)
42+
43+
endif()

‎Detectors/ITSMFT/ITS/simulation/src/digi2raw.cxx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ int main(int argc, char** argv)
6262
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
6363
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(DefRDHVersion), "RDH version to use");
6464
add_option("no-empty-hbf,e", bpo::value<bool>()->default_value(false)->implicit_value(true), "do not create empty HBF pages (except for HBF starting TF)");
65-
//add_option("digitization-config,d", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "configKeyValues file from digitization");
66-
add_option("digitization-config,d", bpo::value<std::string>()->default_value("none"), "configKeyValues file from digitization");
65+
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
6766
add_option("configKeyValues", bpo::value<std::string>()->default_value(""), "comma-separated configKeyValues");
6867

6968
opt_all.add(opt_general).add(opt_hidden);
@@ -85,9 +84,9 @@ int main(int argc, char** argv)
8584
exit(2);
8685
}
8786

88-
std::string confDig = vm["digitization-config"].as<std::string>();
87+
std::string confDig = vm["hbfutils-config"].as<std::string>();
8988
if (!confDig.empty() && confDig != "none") {
90-
o2::conf::ConfigurableParam::updateFromFile(confDig);
89+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
9190
}
9291
o2::conf::ConfigurableParam::updateFromString(vm["configKeyValues"].as<std::string>());
9392
digi2raw(vm["input-file"].as<std::string>(),
@@ -97,7 +96,9 @@ int main(int argc, char** argv)
9796
vm["rdh-version"].as<uint32_t>(),
9897
vm["no-empty-hbf"].as<bool>());
9998
LOG(INFO) << "HBFUtils settings used for conversion:";
99+
100100
o2::raw::HBFUtils::Instance().print();
101+
101102
return 0;
102103
}
103104

‎Detectors/ITSMFT/MFT/simulation/src/digi2raw.cxx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ int main(int argc, char** argv)
6060
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
6161
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(defRDH), "RDH version to use");
6262
add_option("no-empty-hbf,e", bpo::value<bool>()->default_value(false)->implicit_value(true), "do not create empty HBF pages (except for HBF starting TF)");
63-
//add_option("digitization-config,d", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "configKeyValues file from digitization");
64-
add_option("digitization-config,d", bpo::value<std::string>()->default_value("none"), "configKeyValues file from digitization");
63+
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
6564
add_option("configKeyValues", bpo::value<std::string>()->default_value(""), "comma-separated configKeyValues");
6665

6766
opt_all.add(opt_general).add(opt_hidden);
@@ -83,9 +82,9 @@ int main(int argc, char** argv)
8382
exit(2);
8483
}
8584

86-
std::string confDig = vm["digitization-config"].as<std::string>();
85+
std::string confDig = vm["hbfutils-config"].as<std::string>();
8786
if (!confDig.empty() && confDig != "none") {
88-
o2::conf::ConfigurableParam::updateFromFile(confDig);
87+
o2::conf::ConfigurableParam::updateFromFile(confDig, "HBFUtils");
8988
}
9089
o2::conf::ConfigurableParam::updateFromString(vm["configKeyValues"].as<std::string>());
9190
digi2raw(vm["input-file"].as<std::string>(),
@@ -95,7 +94,9 @@ int main(int argc, char** argv)
9594
vm["rdh-version"].as<uint32_t>(),
9695
vm["no-empty-hbf"].as<bool>());
9796
LOG(INFO) << "HBFUtils settings used for conversion:";
97+
9898
o2::raw::HBFUtils::Instance().print();
99+
99100
return 0;
100101
}
101102

0 commit comments

Comments
 (0)