diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt index 762266c654..e7d544125f 100644 --- a/Framework/CMakeLists.txt +++ b/Framework/CMakeLists.txt @@ -1,5 +1,5 @@ # Produce the final Version.h using template Version.h.in and substituting -# variables. We don't want to polute our source tree with it, thus putting it in +# variables. We don't want to pollute our source tree with it, thus putting it in # binary tree. configure_file("include/QualityControl/Version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/QualityControl/Version.h" @@ -280,7 +280,9 @@ set(TEST_SRCS test/testRepoPathUtils.cxx test/testQualitiesToFlagCollectionConverter.cxx test/testUserCodeInterface.cxx - ) + test/testStringUtils.cxx + test/testRunnerUtils.cxx +) set(TEST_ARGS "" @@ -300,6 +302,8 @@ set(TEST_ARGS "" "" "" + "" + "" ) list(LENGTH TEST_SRCS count) diff --git a/Framework/advanced-aggregator.json b/Framework/advanced-aggregator.json index b403ac9154..eb42e5b468 100644 --- a/Framework/advanced-aggregator.json +++ b/Framework/advanced-aggregator.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/advanced-external-histo.json b/Framework/advanced-external-histo.json index f98b0d6ae6..0af3b638ec 100644 --- a/Framework/advanced-external-histo.json +++ b/Framework/advanced-external-histo.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/advanced.json b/Framework/advanced.json index eb5f7a1ffb..abb5675d53 100644 --- a/Framework/advanced.json +++ b/Framework/advanced.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/basic-aggregator.json b/Framework/basic-aggregator.json index 5005fc8385..e76f1b7303 100644 --- a/Framework/basic-aggregator.json +++ b/Framework/basic-aggregator.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/basic-external-histo.json b/Framework/basic-external-histo.json index 863dcfd3f6..bbf7e78d99 100644 --- a/Framework/basic-external-histo.json +++ b/Framework/basic-external-histo.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/basic-functional.json.in b/Framework/basic-functional.json.in index 310c76e95e..ef1b3aae5f 100644 --- a/Framework/basic-functional.json.in +++ b/Framework/basic-functional.json.in @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "start": "8000000", "end": "9000000", "periodName": "LHC9000x", diff --git a/Framework/basic-no-sampling.json b/Framework/basic-no-sampling.json index 84c7e9f459..f23c45d115 100644 --- a/Framework/basic-no-sampling.json +++ b/Framework/basic-no-sampling.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/basic.json b/Framework/basic.json index a2b3bbf783..3ce6fad6dd 100644 --- a/Framework/basic.json +++ b/Framework/basic.json @@ -11,7 +11,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "periodName": "", "": "Period name - e.g. LHC22c, LHC22c1b_test", "passName": "", "": "Pass type - e.g. spass, cpass1", "provenance": "qc", "": "Provenance - qc or qc_mc depending whether it is normal data or monte carlo data" diff --git a/Framework/batch-test.json.in b/Framework/batch-test.json.in index aff8f36b8d..3b1433170a 100644 --- a/Framework/batch-test.json.in +++ b/Framework/batch-test.json.in @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "start": "8000000", "end": "9000000", "periodName": "LHC9000x", diff --git a/Framework/example-default.json b/Framework/example-default.json index e067f76c2a..b9f4d200f5 100644 --- a/Framework/example-default.json +++ b/Framework/example-default.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/include/QualityControl/Activity.h b/Framework/include/QualityControl/Activity.h index 70a7b67cae..14eb19b369 100644 --- a/Framework/include/QualityControl/Activity.h +++ b/Framework/include/QualityControl/Activity.h @@ -32,7 +32,7 @@ class Activity public: Activity() = default; Activity(int id, - int type, + const std::string& type, const std::string& periodName = "", const std::string& passName = "", const std::string& provenance = "qc", @@ -72,7 +72,7 @@ class Activity virtual ~Activity() = default; int mId{ 0 }; - int mType{ 0 }; + std::string mType{ "NONE" }; std::string mPeriodName{}; std::string mPassName{}; std::string mProvenance{ "qc" }; diff --git a/Framework/include/QualityControl/CommonSpec.h b/Framework/include/QualityControl/CommonSpec.h index 1ac8c3f1ea..7041c346fa 100644 --- a/Framework/include/QualityControl/CommonSpec.h +++ b/Framework/include/QualityControl/CommonSpec.h @@ -29,7 +29,7 @@ struct CommonSpec { std::unordered_map database; int activityNumber{}; - int activityType{}; + std::string activityType = "NONE"; std::string activityPeriodName; std::string activityPassName; std::string activityProvenance = "qc"; diff --git a/Framework/include/QualityControl/runnerUtils.h b/Framework/include/QualityControl/runnerUtils.h index 139306aee1..ee6c399f58 100644 --- a/Framework/include/QualityControl/runnerUtils.h +++ b/Framework/include/QualityControl/runnerUtils.h @@ -17,9 +17,11 @@ #ifndef QUALITYCONTROL_RUNNERUTILS_H #define QUALITYCONTROL_RUNNERUTILS_H +#include #include #include #include +#include #include #include "QualityControl/QcInfoLogger.h" #include "QualityControl/Activity.h" @@ -38,8 +40,8 @@ std::string getFirstTaskName(const std::string& configurationSource); std::string getFirstCheckName(const std::string& configurationSource); bool hasChecks(const std::string& configSource); -template // TODO we should probably limit T to numbers somehow -T computeActivityField(framework::ServiceRegistryRef services, const std::string& name, T fallbackNumber = 0) +template ::value, T>::type> +T computeNumericalActivityField(framework::ServiceRegistryRef services, const std::string& name, T fallbackNumber = 0) { T result = 0; @@ -59,6 +61,7 @@ T computeActivityField(framework::ServiceRegistryRef services, const std::string return result; } +std::string_view translateIntegerRunType(const std::string& runType); Activity computeActivity(framework::ServiceRegistryRef services, const Activity& fallbackActivity); std::string indentTree(int level); diff --git a/Framework/include/QualityControl/stringUtils.h b/Framework/include/QualityControl/stringUtils.h index c30eb5438f..82c5c8c8d5 100644 --- a/Framework/include/QualityControl/stringUtils.h +++ b/Framework/include/QualityControl/stringUtils.h @@ -40,6 +40,11 @@ bool decodeBool(const std::string& value); /// @throw std::runtime_error the value is not a bool bool parseBoolParam(const CustomParameters& customParameters, const std::string& name, const std::string& runType = "default", const std::string& beamType = "default"); +/** + * Check if the string contains only digits. + */ +bool isUnsignedInteger(const std::string& s); + } // namespace o2::quality_control::core #endif // QC_STRING_UTILS_H diff --git a/Framework/multiNode.json b/Framework/multiNode.json index ca83727ca3..3eeef4a36a 100644 --- a/Framework/multiNode.json +++ b/Framework/multiNode.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/multinode-test.json.in b/Framework/multinode-test.json.in index bc981af7d2..fc3445489a 100644 --- a/Framework/multinode-test.json.in +++ b/Framework/multinode-test.json.in @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "start": "8000000", "end": "9000000" }, diff --git a/Framework/postprocessing.json b/Framework/postprocessing.json index 91a355bd9c..0c5d25693a 100644 --- a/Framework/postprocessing.json +++ b/Framework/postprocessing.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/readout-no-sampling.json b/Framework/readout-no-sampling.json index 85b62b85b8..82612f9a80 100644 --- a/Framework/readout-no-sampling.json +++ b/Framework/readout-no-sampling.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/readout.json b/Framework/readout.json index 6f99027b07..c3f68b70f5 100644 --- a/Framework/readout.json +++ b/Framework/readout.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/src/Activity.cxx b/Framework/src/Activity.cxx index 8a93faea4c..b3944f2545 100644 --- a/Framework/src/Activity.cxx +++ b/Framework/src/Activity.cxx @@ -46,7 +46,7 @@ bool Activity::matches(const Activity& other) const // is included in this validity. If checked for any overlaps, we would match with all past Activities, which is not // what we want e.g. in Post-processing triggers. Once we indicate the correct validity, we can change this behaviour. return (mId == 0 || mId == other.mId) && - (mType == 0 || mType == other.mType) && + (mType == "NONE" || mType == other.mType) && (mPeriodName.empty() || mPeriodName == other.mPeriodName) && (mPassName.empty() || mPassName == other.mPassName) && (mProvenance == other.mProvenance) && // provenance has to match! diff --git a/Framework/src/ActivityHelpers.cxx b/Framework/src/ActivityHelpers.cxx index d9c29e451b..e68114629f 100644 --- a/Framework/src/ActivityHelpers.cxx +++ b/Framework/src/ActivityHelpers.cxx @@ -20,6 +20,10 @@ #include #include "QualityControl/ObjectMetadataKeys.h" +#include +#include +#include + using namespace o2::quality_control::repository; namespace o2::quality_control::core::activity_helpers @@ -28,10 +32,8 @@ namespace o2::quality_control::core::activity_helpers std::map asDatabaseMetadata(const core::Activity& activity, bool putDefault) { std::map metadata; - if (putDefault || activity.mType != 0) { - // TODO should we really treat 0 as none? - // we could consider making Activity use std::optional to be clear about this - metadata[metadata_keys::runType] = std::to_string(activity.mType); + if (putDefault || activity.mType != "NONE") { + metadata[metadata_keys::runType] = activity.mType; } if (putDefault || activity.mId != 0) { metadata[metadata_keys::runNumber] = std::to_string(activity.mId); @@ -49,7 +51,12 @@ core::Activity asActivity(const std::map& metadata, co { core::Activity activity; if (auto runType = metadata.find(metadata_keys::runType); runType != metadata.end()) { - activity.mType = std::strtol(runType->second.c_str(), nullptr, 10); + if (isUnsignedInteger(runType->second)) { + // we probably got the former representation of run types, i.e. an integer. We convert it as best as we can. + activity.mType = translateIntegerRunType(runType->second); + } else { + activity.mType = runType->second; + } } if (auto runNumber = metadata.find(metadata_keys::runNumber); runNumber != metadata.end()) { activity.mId = std::strtol(runNumber->second.c_str(), nullptr, 10); @@ -73,8 +80,14 @@ core::Activity asActivity(const std::map& metadata, co core::Activity asActivity(const boost::property_tree::ptree& tree, const std::string& provenance) { core::Activity activity; - if (auto runType = tree.get_optional(metadata_keys::runType); runType.has_value()) { - activity.mType = runType.value(); + if (auto runType = tree.get_optional(metadata_keys::runType); runType.has_value()) { + if (isUnsignedInteger(runType.value())) { + // we probably got the former representation of run types, i.e. an integer. We convert it as best + // as we can using O2's ECSDataAdapter + activity.mType = parameters::GRPECS::RunTypeNames[std::stoi(runType.value())]; + } else { + activity.mType = runType.value(); + } } if (auto runNumber = tree.get_optional(metadata_keys::runNumber); runNumber.has_value()) { activity.mId = runNumber.value(); diff --git a/Framework/src/CustomParameters.cxx b/Framework/src/CustomParameters.cxx index 37e84d09eb..2f598530d8 100644 --- a/Framework/src/CustomParameters.cxx +++ b/Framework/src/CustomParameters.cxx @@ -71,13 +71,7 @@ std::string CustomParameters::at(const std::string& key, const std::string& runT std::string CustomParameters::at(const std::string& key, const Activity& activity) const { - // Get the proper parameter for the given activity - const int runType = activity.mType; // get the type for this run - // convert it to a string (via a string_view as this is what we get from O2) - const std::string_view runTypeStringView = o2::parameters::GRPECS::RunTypeNames[runType]; - const std::string runTypeString{ runTypeStringView }; - // get the param - return at(key, runTypeString, activity.mBeamType); + return at(key, activity.mType, activity.mBeamType); } std::optional CustomParameters::atOptional(const std::string& key, const std::string& runType, const std::string& beamType) const @@ -99,13 +93,7 @@ std::optional CustomParameters::atOptional(const std::string& key, std::optional CustomParameters::atOptional(const std::string& key, const Activity& activity) const { - // Get the proper parameter for the given activity - const int runType = activity.mType; // get the type for this run - // convert it to a string (via a string_view as this is what we get from O2) - const std::string_view runTypeStringView = o2::parameters::GRPECS::RunTypeNames[runType]; - const std::string runTypeString{ runTypeStringView }; - // get the param - return atOptional(key, runTypeString, activity.mBeamType); + return atOptional(key, activity.mType, activity.mBeamType); } std::string CustomParameters::atOrDefaultValue(const std::string& key, std::string defaultValue, const std::string& runType, const std::string& beamType) @@ -120,12 +108,7 @@ std::string CustomParameters::atOrDefaultValue(const std::string& key, std::stri std::string CustomParameters::atOrDefaultValue(const std::string& key, std::string defaultValue, const Activity& activity) const { try { - // Get the proper parameter for the given activity - const int runType = activity.mType; // get the type for this run as an int - // convert it to a string (via a string_view as this is what we get from O2) - const std::string_view runTypeStringView = o2::parameters::GRPECS::RunTypeNames[runType]; - const std::string runTypeString{ runTypeStringView }; - return mCustomParameters.at(runTypeString).at(activity.mBeamType).at(key); + return mCustomParameters.at(activity.mType).at(activity.mBeamType).at(key); } catch (const std::out_of_range& exc) { return defaultValue; } diff --git a/Framework/src/InfrastructureSpecReader.cxx b/Framework/src/InfrastructureSpecReader.cxx index 3c7fb5366f..b4a2bd5612 100644 --- a/Framework/src/InfrastructureSpecReader.cxx +++ b/Framework/src/InfrastructureSpecReader.cxx @@ -59,7 +59,7 @@ CommonSpec InfrastructureSpecReader::readSpecEntry(const std::string spec.database.emplace(key, value.get_value()); } spec.activityNumber = commonTree.get("Activity.number", spec.activityNumber); - spec.activityType = commonTree.get("Activity.type", spec.activityType); + spec.activityType = commonTree.get("Activity.type", spec.activityType); spec.activityPassName = commonTree.get("Activity.passName", spec.activityPassName); spec.activityPeriodName = commonTree.get("Activity.periodName", spec.activityPeriodName); spec.activityProvenance = commonTree.get("Activity.provenance", spec.activityProvenance); diff --git a/Framework/src/MonitorObject.cxx b/Framework/src/MonitorObject.cxx index 95e5a9797a..2e1a0db2f5 100644 --- a/Framework/src/MonitorObject.cxx +++ b/Framework/src/MonitorObject.cxx @@ -42,7 +42,7 @@ MonitorObject::MonitorObject(TObject* object, const std::string& taskName, const mTaskName(taskName), mTaskClass(taskClass), mDetectorName(detectorName), - mActivity(runNumber, 0, periodName, passName, provenance, gInvalidValidityInterval), + mActivity(runNumber, "NONE", periodName, passName, provenance, gInvalidValidityInterval), mIsOwner(true) { } diff --git a/Framework/src/PostProcessingConfig.cxx b/Framework/src/PostProcessingConfig.cxx index 21ac362ae7..790e251e26 100644 --- a/Framework/src/PostProcessingConfig.cxx +++ b/Framework/src/PostProcessingConfig.cxx @@ -31,7 +31,7 @@ PostProcessingConfig::PostProcessingConfig(const std::string& id, const boost::p ccdbUrl(config.get("qc.config.conditionDB.url", "")), consulUrl(config.get("qc.config.consul.url", "")), activity(config.get("qc.config.Activity.number", 0), - config.get("qc.config.Activity.type", 0), + config.get("qc.config.Activity.type", "NONE"), config.get("qc.config.Activity.periodName", ""), config.get("qc.config.Activity.passName", ""), config.get("qc.config.Activity.provenance", "qc"), diff --git a/Framework/src/QualityObject.cxx b/Framework/src/QualityObject.cxx index a2e8a713b5..381dc3a6b7 100644 --- a/Framework/src/QualityObject.cxx +++ b/Framework/src/QualityObject.cxx @@ -35,7 +35,7 @@ QualityObject::QualityObject( mPolicyName{ std::move(policyName) }, mInputs{ std::move(inputs) }, mMonitorObjectsNames{ std::move(monitorObjectsNames) }, - mActivity(runNumber, 0, "", "", "qc", gInvalidValidityInterval) + mActivity(runNumber, "NONE", "", "", "qc", gInvalidValidityInterval) { mQuality.addMetadata(std::move(metadata)); } diff --git a/Framework/src/runnerUtils.cxx b/Framework/src/runnerUtils.cxx index b4f1a3e5b2..c7a562054d 100644 --- a/Framework/src/runnerUtils.cxx +++ b/Framework/src/runnerUtils.cxx @@ -16,6 +16,7 @@ /// #include "QualityControl/runnerUtils.h" +#include "QualityControl/stringUtils.h" #include #include @@ -27,6 +28,7 @@ #include #include +#include namespace o2::quality_control::core { @@ -61,19 +63,41 @@ bool hasChecks(const std::string& configSource) return config->getRecursive("qc").count("checks") > 0; } +/** + * If the runType is of legacy type, i.e. an integer, the corresponding string representation is returned. + * In case we cannot find a string representation we use "NONE". + * @param runType + */ +std::string_view translateIntegerRunType(const std::string& runType) +{ + // runType used to be an integer. If we find an integer in a config file, the risk is that it is translated directly to a string (2->"2"). + // We must rather translate the integer into the corresponding run type string if at all possible. + if (isUnsignedInteger(runType)) { + try { + ILOG(Warning, Ops) << "Activity type was provided as an integer. A matching activity type could be found: " << parameters::GRPECS::RunTypeNames.at(std::stoi(runType)) << ". Consider using the string representation of the run type." << ENDM; + return parameters::GRPECS::RunTypeNames.at(std::stoi(runType)); + } catch (std::out_of_range& exc) { + ILOG(Warning, Ops) << "Activity type was provided as an integer. No matching activity type could be find. Using 'NONE'." << ENDM; + return "NONE"; + } + } + return runType; +} + Activity computeActivity(framework::ServiceRegistryRef services, const Activity& fallbackActivity) { - auto runNumber = computeActivityField(services, "runNumber", fallbackActivity.mId); - auto runType = computeActivityField(services, "runType", fallbackActivity.mType); - auto runStartTimeMs = computeActivityField(services, "runStartTimeMs", fallbackActivity.mValidity.getMin()); - auto runEndTimeMs = computeActivityField(services, "runEndTimeMs", fallbackActivity.mValidity.getMax()); + auto runNumber = computeNumericalActivityField(services, "runNumber", fallbackActivity.mId); + std::string runType = services.get().device()->fConfig->GetProperty("runType", fallbackActivity.mType); + runType = translateIntegerRunType(runType); + auto runStartTimeMs = computeNumericalActivityField(services, "runStartTimeMs", fallbackActivity.mValidity.getMin()); + auto runEndTimeMs = computeNumericalActivityField(services, "runEndTimeMs", fallbackActivity.mValidity.getMax()); auto partitionName = services.get().device()->fConfig->GetProperty("environment_id", fallbackActivity.mPartitionName); auto periodName = services.get().device()->fConfig->GetProperty("lhcPeriod", ""); if (periodName.empty()) { // this how one has to get it on EPNs. periodName = services.get().device()->fConfig->GetProperty("lhc_period", fallbackActivity.mPeriodName); } - auto fillNumber = computeActivityField(services, "fillInfoFillNumber", fallbackActivity.mFillNumber); + auto fillNumber = computeNumericalActivityField(services, "fillInfoFillNumber", fallbackActivity.mFillNumber); auto beam_type = services.get().device()->fConfig->GetProperty("fillInfoBeamType", fallbackActivity.mBeamType); Activity activity( diff --git a/Framework/src/stringUtils.cxx b/Framework/src/stringUtils.cxx index 267f711f16..e6509a5c93 100644 --- a/Framework/src/stringUtils.cxx +++ b/Framework/src/stringUtils.cxx @@ -80,4 +80,10 @@ bool parseBoolParam(const CustomParameters& customParameters, const std::string& } } +bool isUnsignedInteger(const std::string& s) +{ + return !s.empty() && std::find_if(s.begin(), + s.end(), [](unsigned char c) { return !std::isdigit(c); }) == s.end(); +} + } // namespace o2::quality_control::core \ No newline at end of file diff --git a/Framework/test/testActivity.cxx b/Framework/test/testActivity.cxx index 936eca380c..f0f0f0f0d8 100644 --- a/Framework/test/testActivity.cxx +++ b/Framework/test/testActivity.cxx @@ -25,37 +25,37 @@ TEST_CASE("test_matching") // the default Activity has the widest match (provenance always has to match) Activity matcher{}; - CHECK(matcher.matches({ 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" })); - CHECK(matcher.matches({ 0, 0, "", "", "qc", { 1, 10 }, "" })); - CHECK(!matcher.matches({ 0, 0, "", "", "qc_mc", { 1, 10 }, "" })); + CHECK(matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" })); + CHECK(matcher.matches({ 0, "NONE", "", "", "qc", { 1, 10 }, "" })); + CHECK(!matcher.matches({ 0, "NONE", "", "", "qc_mc", { 1, 10 }, "" })); CHECK(matcher.matches({})); CHECK(Activity().matches(matcher)); } { // the most concrete matcher // it also should not match any less concrete Activity - Activity matcher{ 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" }; + Activity matcher{ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" }; // should match only the same but with equal or contained validity - CHECK(matcher.matches({ 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" })); - CHECK(matcher.matches({ 300000, 1, "LHC22a", "spass", "qc", { 5, 7 }, "pp" })); - CHECK(matcher.matches({ 300000, 1, "LHC22a", "spass", "qc", { 5, 15 }, "pp" })); // we support this until we indicate correct validity of our objects - CHECK(!matcher.matches({ 300000, 1, "LHC22a", "spass", "qc", { 15, 25 }, "pp" })); + CHECK(matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" })); + CHECK(matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 5, 7 }, "pp" })); + CHECK(matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 5, 15 }, "pp" })); // we support this until we indicate correct validity of our objects + CHECK(!matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 15, 25 }, "pp" })); // should not match if any other parameter is different - CHECK(!matcher.matches({ 300001, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" })); - CHECK(!matcher.matches({ 300000, 2, "LHC22a", "spass", "qc", { 1, 10 }, "pp" })); - CHECK(!matcher.matches({ 300000, 1, "LHC22b", "apass", "qc", { 1, 10 }, "pp" })); - CHECK(!matcher.matches({ 300000, 1, "LHC22a", "spass", "qc_mc", { 1, 10 }, "pp" })); - CHECK(!matcher.matches({ 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "PbPb" })); + CHECK(!matcher.matches({ 300001, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" })); + CHECK(!matcher.matches({ 300000, "TECHNICAL", "LHC22a", "spass", "qc", { 1, 10 }, "pp" })); + CHECK(!matcher.matches({ 300000, "PHYSICS", "LHC22b", "apass", "qc", { 1, 10 }, "pp" })); + CHECK(!matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc_mc", { 1, 10 }, "pp" })); + CHECK(!matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "PbPb" })); // should not match any less concrete field - CHECK(!matcher.matches({ 0, 1, "LHC22a", "spass", "qc", { 1, 10 } })); - CHECK(!matcher.matches({ 300000, 0, "LHC22a", "spass", "qc", { 1, 10 } })); - CHECK(!matcher.matches({ 300000, 1, "", "spass", "qc", { 1, 10 } })); - CHECK(!matcher.matches({ 300000, 1, "LHC22a", "", "qc", { 1, 10 } })); - CHECK(!matcher.matches({ 300000, 1, "LHC22a", "spass", "qc", { 0, 1000000 } })); - CHECK(!matcher.matches({ 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "" })); + CHECK(!matcher.matches({ 0, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 } })); + CHECK(!matcher.matches({ 300000, "NONE", "LHC22a", "spass", "qc", { 1, 10 } })); + CHECK(!matcher.matches({ 300000, "PHYSICS", "", "spass", "qc", { 1, 10 } })); + CHECK(!matcher.matches({ 300000, "PHYSICS", "LHC22a", "", "qc", { 1, 10 } })); + CHECK(!matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 0, 1000000 } })); + CHECK(!matcher.matches({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "" })); } } @@ -63,16 +63,16 @@ TEST_CASE("test_same") { { // Activity::same should return true if the other one is has the same field, but the validity can be different - Activity activity{ 300000, 1, "LHC22a", "spass", "qc", { 1, 10 } }; + Activity activity{ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 } }; - CHECK(activity.same({ 300000, 1, "LHC22a", "spass", "qc", { 1, 10 } })); - CHECK(activity.same({ 300000, 1, "LHC22a", "spass", "qc", { 2, 5 } })); - CHECK(activity.same({ 300000, 1, "LHC22a", "spass", "qc", { 432, 54334 } })); + CHECK(activity.same({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 } })); + CHECK(activity.same({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 2, 5 } })); + CHECK(activity.same({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 432, 54334 } })); - CHECK(!activity.same({ 300001, 1, "LHC22a", "spass", "qc", { 1, 10 } })); - CHECK(!activity.same({ 300000, 2, "LHC22a", "spass", "qc", { 1, 10 } })); - CHECK(!activity.same({ 300000, 1, "LHC22b", "spass", "qc", { 1, 10 } })); - CHECK(!activity.same({ 300000, 1, "LHC22a", "apass", "qc", { 1, 10 } })); - CHECK(!activity.same({ 300000, 1, "LHC22a", "spass", "qc_mc", { 1, 10 } })); + CHECK(!activity.same({ 300001, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 } })); + CHECK(!activity.same({ 300000, "TECHNICAL", "LHC22a", "spass", "qc", { 1, 10 } })); + CHECK(!activity.same({ 300000, "PHYSICS", "LHC22b", "spass", "qc", { 1, 10 } })); + CHECK(!activity.same({ 300000, "PHYSICS", "LHC22a", "apass", "qc", { 1, 10 } })); + CHECK(!activity.same({ 300000, "PHYSICS", "LHC22a", "spass", "qc_mc", { 1, 10 } })); } } \ No newline at end of file diff --git a/Framework/test/testActivityHelpers.cxx b/Framework/test/testActivityHelpers.cxx index 5c0e3a0170..b8ff47e1e0 100644 --- a/Framework/test/testActivityHelpers.cxx +++ b/Framework/test/testActivityHelpers.cxx @@ -33,7 +33,7 @@ TEST_CASE("activity_helpers_asDatabaseMetadata") Activity defaultActivity; auto metadata = activity_helpers::asDatabaseMetadata(defaultActivity, true); - REQUIRE(metadata[metadata_keys::runType] == "0"); + REQUIRE(metadata[metadata_keys::runType] == "NONE"); REQUIRE(metadata[metadata_keys::runNumber] == "0"); REQUIRE(metadata[metadata_keys::passName].empty()); REQUIRE(metadata[metadata_keys::periodName].empty()); @@ -42,13 +42,13 @@ TEST_CASE("activity_helpers_asDatabaseMetadata") SECTION("Non-default values") { Activity customActivity; - customActivity.mType = 2; + customActivity.mType = "TECHNICAL"; customActivity.mId = 3; customActivity.mPassName = "pass"; customActivity.mPeriodName = "period"; auto metadata = activity_helpers::asDatabaseMetadata(customActivity, false); - CHECK(metadata[metadata_keys::runType] == "2"); + CHECK(metadata[metadata_keys::runType] == "TECHNICAL"); CHECK(metadata[metadata_keys::runNumber] == "3"); CHECK(metadata[metadata_keys::passName] == "pass"); CHECK(metadata[metadata_keys::periodName] == "period"); @@ -72,7 +72,7 @@ TEST_CASE("activity_helpers_asActivity") Activity activity = activity_helpers::asActivity(emptyMetadata, "test_provenance"); - CHECK(activity.mType == 0); + CHECK(activity.mType == "NONE"); CHECK(activity.mId == 0); CHECK(activity.mPassName.empty()); CHECK(activity.mPeriodName.empty()); @@ -82,7 +82,7 @@ TEST_CASE("activity_helpers_asActivity") SECTION("Non-empty metadata map") { std::map metadata = { - { metadata_keys::runType, "2" }, + { metadata_keys::runType, "TECHNICAL" }, { metadata_keys::runNumber, "3" }, { metadata_keys::passName, "pass" }, { metadata_keys::periodName, "period" }, @@ -92,7 +92,7 @@ TEST_CASE("activity_helpers_asActivity") Activity activity = activity_helpers::asActivity(metadata, "test_provenance"); - CHECK(activity.mType == 2); + CHECK(activity.mType == "TECHNICAL"); CHECK(activity.mId == 3); CHECK(activity.mPassName == "pass"); CHECK(activity.mPeriodName == "period"); @@ -111,7 +111,7 @@ TEST_CASE("activity_helpers_asActivityPtree") Activity activity = activity_helpers::asActivity(emptyTree, "test_provenance"); - CHECK(activity.mType == 0); + CHECK(activity.mType == "NONE"); CHECK(activity.mId == 0); CHECK(activity.mPassName.empty()); CHECK(activity.mPeriodName.empty()); @@ -121,7 +121,7 @@ TEST_CASE("activity_helpers_asActivityPtree") SECTION("Non-empty property tree") { boost::property_tree::ptree tree; - tree.put(metadata_keys::runType, 2); + tree.put(metadata_keys::runType, "TECHNICAL"); tree.put(metadata_keys::runNumber, 3); tree.put(metadata_keys::passName, "pass"); tree.put(metadata_keys::periodName, "period"); @@ -130,7 +130,7 @@ TEST_CASE("activity_helpers_asActivityPtree") Activity activity = activity_helpers::asActivity(tree, "test_provenance"); - CHECK(activity.mType == 2); + CHECK(activity.mType == "TECHNICAL"); CHECK(activity.mId == 3); CHECK(activity.mPassName == "pass"); CHECK(activity.mPeriodName == "period"); @@ -145,33 +145,33 @@ TEST_CASE("test_strictestMatchingActivity") { // providing a map accessor + everything being the same except the validity std::map m{ - { 1, { 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" } }, - { 2, { 300000, 1, "LHC22a", "spass", "qc", { 10, 20 }, "pp" } }, - { 4, { 300000, 1, "LHC22a", "spass", "qc", { 20, 30 }, "pp" } }, - { 3, { 300000, 1, "LHC22a", "spass", "qc", { 30, 40 }, "pp" } } + { 1, { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" } }, + { 2, { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 10, 20 }, "pp" } }, + { 4, { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 20, 30 }, "pp" } }, + { 3, { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 30, 40 }, "pp" } } }; auto result = activity_helpers::strictestMatchingActivity(m.begin(), m.end(), [](const auto& item) { return item.second; }); - Activity expectation{ 300000, 1, "LHC22a", "spass", "qc", { 1, 40 }, "pp" }; + Activity expectation{ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 40 }, "pp" }; CHECK(result == expectation); } { // providing a vector (default accessor) + different run numbers and validities std::vector m{ - { 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" }, - { 300001, 1, "LHC22a", "spass", "qc", { 20, 30 }, "pp" } + { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" }, + { 300001, "PHYSICS", "LHC22a", "spass", "qc", { 20, 30 }, "pp" } }; auto result = activity_helpers::strictestMatchingActivity(m.begin(), m.end()); - Activity expectation{ 0, 1, "LHC22a", "spass", "qc", { 1, 30 }, "pp" }; + Activity expectation{ 0, "PHYSICS", "LHC22a", "spass", "qc", { 1, 30 }, "pp" }; CHECK(result == expectation); } { // providing a vector (custom accessor) + different everything std::vector m{ - { 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" }, - { 300001, 2, "LHC22b", "apass2", "qc_mc", { 20, 30 }, "PbPb" } + { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" }, + { 300001, "TECHNICAL", "LHC22b", "apass2", "qc_mc", { 20, 30 }, "PbPb" } }; auto result = activity_helpers::strictestMatchingActivity(m.begin(), m.end(), [](const auto& a) { return a; }); - Activity expectation{ 0, 0, "", "", "qc", { 1, 30 }, "" }; + Activity expectation{ 0, "NONE", "", "", "qc", { 1, 30 }, "" }; CHECK(result == expectation); } } @@ -182,33 +182,58 @@ TEST_CASE("test_overlappingActivity") { // providing a map accessor + everything being the same except the validity std::map m{ - { 1, { 300000, 1, "LHC22a", "spass", "qc", { 1, 40 }, "pp" } }, - { 2, { 300000, 1, "LHC22a", "spass", "qc", { 10, 20 }, "pp" } }, - { 4, { 300000, 1, "LHC22a", "spass", "qc", { 15, 30 }, "pp" } }, - { 3, { 300000, 1, "LHC22a", "spass", "qc", { 17, 40 }, "pp" } } + { 1, { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 40 }, "pp" } }, + { 2, { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 10, 20 }, "pp" } }, + { 4, { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 15, 30 }, "pp" } }, + { 3, { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 17, 40 }, "pp" } } }; auto result = activity_helpers::overlappingActivity(m.begin(), m.end(), [](const auto& item) { return item.second; }); - Activity expectation{ 300000, 1, "LHC22a", "spass", "qc", { 17, 20 }, "pp" }; + Activity expectation{ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 17, 20 }, "pp" }; CHECK(result == expectation); } { // providing a vector (default accessor) + different run numbers and validities std::vector m{ - { 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" }, - { 300001, 1, "LHC22a", "spass", "qc", { 10, 30 }, "pp" } + { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" }, + { 300001, "PHYSICS", "LHC22a", "spass", "qc", { 10, 30 }, "pp" } }; auto result = activity_helpers::overlappingActivity(m.begin(), m.end()); - Activity expectation{ 0, 1, "LHC22a", "spass", "qc", { 10, 10 }, "pp" }; + Activity expectation{ 0, "PHYSICS", "LHC22a", "spass", "qc", { 10, 10 }, "pp" }; CHECK(result == expectation); } { // providing a vector (custom accessor) + different everything std::vector m{ - { 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" }, - { 300001, 2, "LHC22b", "apass2", "qc_mc", { 20, 30 }, "PbPb" } + { 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" }, + { 300001, "TECHNICAL", "LHC22b", "apass2", "qc_mc", { 20, 30 }, "PbPb" } }; auto result = activity_helpers::overlappingActivity(m.begin(), m.end(), [](const auto& a) { return a; }); - Activity expectation{ 0, 0, "", "", "qc", { 20, 10 }, "" }; // invalid validity + Activity expectation{ 0, "NONE", "", "", "qc", { 20, 10 }, "" }; // invalid validity CHECK(result == expectation); } } + +TEST_CASE("test_backward_compatible_activity_type") +{ + SECTION("metadata map") + { + std::map metadata = { + { metadata_keys::runType, "2" }, // technical + }; + + Activity activity = activity_helpers::asActivity(metadata, "test_provenance"); + + CHECK(activity.mType == "TECHNICAL"); + std::cout << "type " << activity << std::endl; + } + + SECTION("property tree") + { + boost::property_tree::ptree tree; + tree.put(metadata_keys::runType, "2"); + + Activity activity = activity_helpers::asActivity(tree, "test_provenance"); + + CHECK(activity.mType == "TECHNICAL"); + } +} \ No newline at end of file diff --git a/Framework/test/testAggregatorRunner.cxx b/Framework/test/testAggregatorRunner.cxx index a8e406a925..82f7214ad7 100644 --- a/Framework/test/testAggregatorRunner.cxx +++ b/Framework/test/testAggregatorRunner.cxx @@ -181,7 +181,7 @@ TEST_CASE("test_aggregator_activity_propagation") REQUIRE(myAggregatorCConfig != aggregatorConfigs.end()); auto aggregator = make_shared(*myAggregatorCConfig); aggregator->init(); - Activity defaultActivity{ 123, 1, "LHC34b", "apass4", "qc", { 34, 54 }, "proton - mouton" }; + Activity defaultActivity{ 123, "PHYSICS", "LHC34b", "apass4", "qc", { 34, 54 }, "proton - mouton" }; // empty list -> Good QualityObjectsMapType qoMap; @@ -192,14 +192,14 @@ TEST_CASE("test_aggregator_activity_propagation") // Add dataSizeCheck1/q1=good and dataSizeCheck1/q2=medium -> return medium auto qo1 = make_shared(Quality::Good, "dataSizeCheck"); - qo1->setActivity({ 123, 1, "LHC34b", "apass4", "qc", { 100, 200 }, "proton - mouton" }); + qo1->setActivity({ 123, "PHYSICS", "LHC34b", "apass4", "qc", { 100, 200 }, "proton - mouton" }); auto qo2 = make_shared(Quality::Medium, "someNumbersCheck"); - qo2->setActivity({ 123, 1, "LHC34b", "apass4", "qc", { 125, 175 }, "proton - mouton" }); + qo2->setActivity({ 123, "PHYSICS", "LHC34b", "apass4", "qc", { 125, 175 }, "proton - mouton" }); qoMap["dataSizeCheck"] = qo1; qoMap["someNumbersCheck"] = qo2; result = aggregator->aggregate(qoMap); REQUIRE(result.size() == 2); - CHECK(result[0]->getActivity() == Activity{ 123, 1, "LHC34b", "apass4", "qc", { 125, 175 }, "proton - mouton" }); - CHECK(result[1]->getActivity() == Activity{ 123, 1, "LHC34b", "apass4", "qc", { 125, 175 }, "proton - mouton" }); + CHECK(result[0]->getActivity() == Activity{ 123, "PHYSICS", "LHC34b", "apass4", "qc", { 125, 175 }, "proton - mouton" }); + CHECK(result[1]->getActivity() == Activity{ 123, "PHYSICS", "LHC34b", "apass4", "qc", { 125, 175 }, "proton - mouton" }); } diff --git a/Framework/test/testCcdbDatabase.cxx b/Framework/test/testCcdbDatabase.cxx index 073907d3e8..30494f184a 100644 --- a/Framework/test/testCcdbDatabase.cxx +++ b/Framework/test/testCcdbDatabase.cxx @@ -226,11 +226,11 @@ BOOST_AUTO_TEST_CASE(ccdb_retrieve_qo, *utf::depends_on("ccdb_store")) BOOST_AUTO_TEST_CASE(ccdb_provenance, *utf::depends_on("ccdb_store")) { test_fixture f; - std::shared_ptr qo = f.backend->retrieveQO(RepoPathUtils::getQoPath("TST", f.taskName + "/provenance", "", {}, "", false), -1, { 0, 0, "", "", "qc_hello" }); + std::shared_ptr qo = f.backend->retrieveQO(RepoPathUtils::getQoPath("TST", f.taskName + "/provenance", "", {}, "", false), -1, { 0, "NONE", "", "", "qc_hello" }); BOOST_REQUIRE_NE(qo, nullptr); BOOST_CHECK_EQUAL(qo->getActivity().mProvenance, "qc_hello"); - std::shared_ptr mo = f.backend->retrieveMO(f.getMoFolder("provenance"), "provenance", -1, { 0, 0, "", "", "qc_hello" }); + std::shared_ptr mo = f.backend->retrieveMO(f.getMoFolder("provenance"), "provenance", -1, { 0, "NONE", "", "", "qc_hello" }); BOOST_REQUIRE_NE(mo, nullptr); BOOST_CHECK_EQUAL(mo->getActivity().mProvenance, "qc_hello"); } @@ -410,7 +410,7 @@ BOOST_AUTO_TEST_CASE(ccdb_store_retrieve_latest) mo1->setValidity({ 10, 30 }); f.backend->storeMO(mo1); - std::shared_ptr moBack = f.backend->retrieveMO(f.getMoFolder("latest_test"), "latest_test", DatabaseInterface::Timestamp::Latest, { 1234, 0, "LHC66", "passName1", "qc" }); + std::shared_ptr moBack = f.backend->retrieveMO(f.getMoFolder("latest_test"), "latest_test", DatabaseInterface::Timestamp::Latest, { 1234, "NONE", "LHC66", "passName1", "qc" }); BOOST_REQUIRE(moBack != nullptr); auto h1Back = dynamic_cast(moBack->getObject()); BOOST_REQUIRE(h1Back != nullptr); diff --git a/Framework/test/testCheck.cxx b/Framework/test/testCheck.cxx index f1fca70541..806fca9f7d 100644 --- a/Framework/test/testCheck.cxx +++ b/Framework/test/testCheck.cxx @@ -158,8 +158,8 @@ TEST_CASE("test_check_activity") { "abcTask/test2", dummyMO("test2") } }; - moMap["abcTask/test1"]->setActivity({ 300000, 1, "LHC22a", "spass", "qc", { 1, 10 }, "pp" }); - moMap["abcTask/test2"]->setActivity({ 300000, 1, "LHC22a", "spass", "qc", { 5, 15 }, "pp" }); + moMap["abcTask/test1"]->setActivity({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 1, 10 }, "pp" }); + moMap["abcTask/test2"]->setActivity({ 300000, "PHYSICS", "LHC22a", "spass", "qc", { 5, 15 }, "pp" }); check.init(); check.startOfActivity(Activity()); diff --git a/Framework/test/testCheckWorkflow.json b/Framework/test/testCheckWorkflow.json index 4af974eed0..cc29b8fa5d 100644 --- a/Framework/test/testCheckWorkflow.json +++ b/Framework/test/testCheckWorkflow.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Framework/test/testCustomParameters.cxx b/Framework/test/testCustomParameters.cxx index 4c01767657..b9ea316b9e 100644 --- a/Framework/test/testCustomParameters.cxx +++ b/Framework/test/testCustomParameters.cxx @@ -139,7 +139,7 @@ TEST_CASE("test_at_optional_activity") { Activity activity; activity.mBeamType = "PROTON-PROTON"; - activity.mType = 1; + activity.mType = "PHYSICS"; CustomParameters cp; cp.set("aaa", "AAA"); @@ -155,7 +155,7 @@ TEST_CASE("test_at_optional_activity") Activity activity2; activity.mBeamType = "Pb-Pb"; - activity.mType = 1; + activity.mType = "PHYSICS"; CHECK(cp.atOptional("aaa", activity).value() == "DDD"); } diff --git a/Framework/test/testMonitorObjectCollection.cxx b/Framework/test/testMonitorObjectCollection.cxx index 8361c916a5..c636ed9daa 100644 --- a/Framework/test/testMonitorObjectCollection.cxx +++ b/Framework/test/testMonitorObjectCollection.cxx @@ -44,7 +44,7 @@ TEST_CASE("monitor_object_collection_merge") TH1I* targetTH1I = new TH1I("histo 1d", "histo 1d", bins, min, max); targetTH1I->Fill(5); MonitorObject* targetMoTH1I = new MonitorObject(targetTH1I, "histo 1d", "class", "DET"); - targetMoTH1I->setActivity({ 300000, 1, "LHC32x", "apass2", "qc_async", gInvalidValidityInterval }); + targetMoTH1I->setActivity({ 300000, "PHYSICS", "LHC32x", "apass2", "qc_async", gInvalidValidityInterval }); targetMoTH1I->setIsOwner(true); target->Add(targetMoTH1I); @@ -55,7 +55,7 @@ TEST_CASE("monitor_object_collection_merge") TH1I* otherTH1I = new TH1I("histo 1d", "histo 1d", bins, min, max); otherTH1I->Fill(5); MonitorObject* otherMoTH1I = new MonitorObject(otherTH1I, "histo 1d", "class", "DET"); - otherMoTH1I->setActivity({ 300000, 1, "LHC32x", "apass2", "qc_async", { 43, 60 } }); + otherMoTH1I->setActivity({ 300000, "PHYSICS", "LHC32x", "apass2", "qc_async", { 43, 60 } }); otherMoTH1I->setIsOwner(true); other->Add(otherMoTH1I); diff --git a/Framework/test/testRootFileStorage.cxx b/Framework/test/testRootFileStorage.cxx index 592700ce18..d44d9462fb 100644 --- a/Framework/test/testRootFileStorage.cxx +++ b/Framework/test/testRootFileStorage.cxx @@ -59,7 +59,7 @@ TEST_CASE("int_write_read") TH1I* histoBefore = new TH1I("histo 1d", "histo 1d", bins, min, max); histoBefore->Fill(5); MonitorObject* moHistoBefore = new MonitorObject(histoBefore, "histo 1d", "class", "DET"); - moHistoBefore->setActivity({ 300000, 1, "LHC32x", "apass2", "qc_async", { 100, 300 } }); + moHistoBefore->setActivity({ 300000, "PHYSICS", "LHC32x", "apass2", "qc_async", { 100, 300 } }); moHistoBefore->setIsOwner(true); mocBefore->Add(moHistoBefore); { @@ -130,7 +130,7 @@ TEST_CASE("mw_write_read") TH1I* histoBefore = new TH1I("histo 1d", "histo 1d", bins, min, max); histoBefore->Fill(5); MonitorObject* moHistoBefore = new MonitorObject(histoBefore, "histo 1d", "class", "DET"); - moHistoBefore->setActivity({ 300000, 1, "LHC32x", "apass2", "qc_async", { 100, 300 } }); + moHistoBefore->setActivity({ 300000, "PHYSICS", "LHC32x", "apass2", "qc_async", { 100, 300 } }); moHistoBefore->setIsOwner(true); mocBefore->Add(moHistoBefore); { @@ -206,14 +206,14 @@ TEST_CASE("read_structure") TH1I* histo1 = new TH1I("histo 1", "histo 1", bins, min, max); histo1->Fill(5); MonitorObject* moHisto1 = new MonitorObject(histo1, "histo 1", "class", "DET"); - moHisto1->setActivity({ 300000, 1, "LHC32x", "apass2", "qc_async", { 100, 300 } }); + moHisto1->setActivity({ 300000, "PHYSICS", "LHC32x", "apass2", "qc_async", { 100, 300 } }); moHisto1->setIsOwner(true); moc->Add(moHisto1); TH1I* histo2 = new TH1I("histo 2", "histo 2", bins, min, max); histo1->Fill(5); MonitorObject* moHisto2 = new MonitorObject(histo2, "histo 2", "class", "DET"); - moHisto2->setActivity({ 300000, 1, "LHC32x", "apass2", "qc_async", { 100, 300 } }); + moHisto2->setActivity({ 300000, "PHYSICS", "LHC32x", "apass2", "qc_async", { 100, 300 } }); moHisto2->setIsOwner(true); moc->Add(moHisto2); @@ -339,14 +339,14 @@ TEST_CASE("walking") TH1I* histo1 = new TH1I("histo 1", "histo 1", bins, min, max); histo1->Fill(5); MonitorObject* moHisto1 = new MonitorObject(histo1, "histo 1", "class", "DET"); - moHisto1->setActivity({ 300000, 1, "LHC32x", "apass2", "qc_async", { 100, 300 } }); + moHisto1->setActivity({ 300000, "PHYSICS", "LHC32x", "apass2", "qc_async", { 100, 300 } }); moHisto1->setIsOwner(true); moc->Add(moHisto1); TH1I* histo2 = new TH1I("histo 2", "histo 2", bins, min, max); histo1->Fill(5); MonitorObject* moHisto2 = new MonitorObject(histo2, "histo 2", "class", "DET"); - moHisto2->setActivity({ 300000, 1, "LHC32x", "apass2", "qc_async", { 100, 300 } }); + moHisto2->setActivity({ 300000, "PHYSICS", "LHC32x", "apass2", "qc_async", { 100, 300 } }); moHisto2->setIsOwner(true); moc->Add(moHisto2); diff --git a/Framework/test/testRunnerUtils.cxx b/Framework/test/testRunnerUtils.cxx new file mode 100644 index 0000000000..e9e15393fa --- /dev/null +++ b/Framework/test/testRunnerUtils.cxx @@ -0,0 +1,40 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// +/// \file testRunnerUtils.cxx +/// \author Barthelemy von Haller +/// + +#include "QualityControl/runnerUtils.h" + +#define BOOST_TEST_MODULE RunnerUtils test +#define BOOST_TEST_MAIN +#define BOOST_TEST_DYN_LINK + +#include +#include +#include + +using namespace o2::quality_control::core; +using namespace std; + +BOOST_AUTO_TEST_CASE(test_computeActivity) +{ + string runType; + BOOST_CHECK_EQUAL(translateIntegerRunType("0"), "NONE"); + BOOST_CHECK_EQUAL(translateIntegerRunType("1"), "PHYSICS"); + BOOST_CHECK_EQUAL(translateIntegerRunType("18"), "CALIBRATION_VRESETD"); + BOOST_CHECK_EQUAL(translateIntegerRunType("34"), "NONE"); // unknown + BOOST_CHECK_EQUAL(translateIntegerRunType("-134"), "-134"); // not a uint + BOOST_CHECK_EQUAL(translateIntegerRunType("NONE"), "NONE"); + BOOST_CHECK_EQUAL(translateIntegerRunType("bla"), "bla"); +} \ No newline at end of file diff --git a/Framework/test/testSharedConfig.json b/Framework/test/testSharedConfig.json index 79accde926..c82dee3d76 100644 --- a/Framework/test/testSharedConfig.json +++ b/Framework/test/testSharedConfig.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/test/testStringUtils.cxx b/Framework/test/testStringUtils.cxx new file mode 100644 index 0000000000..7d320fb37c --- /dev/null +++ b/Framework/test/testStringUtils.cxx @@ -0,0 +1,37 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// +/// \file testStringUtils.cxx +/// \author Barthelemy von Haller +/// + +#include "QualityControl/stringUtils.h" + +#define BOOST_TEST_MODULE Triggers test +#define BOOST_TEST_MAIN +#define BOOST_TEST_DYN_LINK + +#include + +using namespace o2::quality_control::core; + +BOOST_AUTO_TEST_CASE(test_is_number) +{ + BOOST_CHECK_EQUAL(isUnsignedInteger("1"), true); + BOOST_CHECK_EQUAL(isUnsignedInteger("-1"), false); + BOOST_CHECK_EQUAL(isUnsignedInteger("1000000"), true); + BOOST_CHECK_EQUAL(isUnsignedInteger("0.1"), false); + BOOST_CHECK_EQUAL(isUnsignedInteger(".2"), false); + BOOST_CHECK_EQUAL(isUnsignedInteger("x"), false); + BOOST_CHECK_EQUAL(isUnsignedInteger("1x"), false); + BOOST_CHECK_EQUAL(isUnsignedInteger("......"), false); +} \ No newline at end of file diff --git a/Framework/test/testTrendingTask.json b/Framework/test/testTrendingTask.json index b48b238aa3..d5710613ec 100644 --- a/Framework/test/testTrendingTask.json +++ b/Framework/test/testTrendingTask.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Framework/test/testTriggers.cxx b/Framework/test/testTriggers.cxx index f7e6883fb1..80fee35f18 100644 --- a/Framework/test/testTriggers.cxx +++ b/Framework/test/testTriggers.cxx @@ -156,15 +156,15 @@ BOOST_AUTO_TEST_CASE(test_trigger_for_each_object) std::shared_ptr repository = DatabaseFactory::create("CCDB"); repository->connect(CCDB_ENDPOINT, "", "", ""); validity_time_t currentTimestamp = CcdbDatabase::getCurrentTimestamp(); - mo->setActivity({ 100, 2, "FCC42x", "tpass1", "qc", { currentTimestamp, gInvalidValidityInterval.getMax() } }); + mo->setActivity({ 100, "TECHNICAL", "FCC42x", "tpass1", "qc", { currentTimestamp, gInvalidValidityInterval.getMax() } }); repository->storeMO(mo); - mo->setActivity({ 101, 2, "FCC42x", "tpass1", "qc", { currentTimestamp + 1000, gInvalidValidityInterval.getMax() } }); + mo->setActivity({ 101, "TECHNICAL", "FCC42x", "tpass1", "qc", { currentTimestamp + 1000, gInvalidValidityInterval.getMax() } }); repository->storeMO(mo); - mo->setActivity({ 100, 2, "FCC42x", "tpass2", "qc", { currentTimestamp + 2000, gInvalidValidityInterval.getMax() } }); + mo->setActivity({ 100, "TECHNICAL", "FCC42x", "tpass2", "qc", { currentTimestamp + 2000, gInvalidValidityInterval.getMax() } }); repository->storeMO(mo); { - const Activity activityAllRunsPass1{ 0, 2, "FCC42x", "tpass1", "qc" }; + const Activity activityAllRunsPass1{ 0, "TECHNICAL", "FCC42x", "tpass1", "qc" }; auto forEachObjectTrigger = triggers::ForEachObject(CCDB_ENDPOINT, "qcdb", objectPath, activityAllRunsPass1); BOOST_CHECK_EQUAL(forEachObjectTrigger(), TriggerType::ForEachObject); @@ -173,7 +173,7 @@ BOOST_AUTO_TEST_CASE(test_trigger_for_each_object) } { - const Activity activityRun100AllPasses{ 100, 2, "FCC42x", "", "qc" }; + const Activity activityRun100AllPasses{ 100, "TECHNICAL", "FCC42x", "", "qc" }; auto forEachObjectTrigger = triggers::ForEachObject(CCDB_ENDPOINT, "qcdb", objectPath, activityRun100AllPasses); BOOST_CHECK_EQUAL(forEachObjectTrigger(), TriggerType::ForEachObject); @@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(test_trigger_for_each_object) } { - const Activity activityAll{ 0, 0, "", "", "qc" }; + const Activity activityAll{ 0, "NONE", "", "", "qc" }; auto forEachObjectTrigger = triggers::ForEachObject(CCDB_ENDPOINT, "qcdb", objectPath, activityAll); BOOST_CHECK_EQUAL(forEachObjectTrigger(), TriggerType::ForEachObject); @@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE(test_trigger_for_each_object) } { - const Activity activityTimeRestriction{ 0, 0, "", "", "qc", { static_cast(currentTimestamp), static_cast(currentTimestamp + 5) } }; + const Activity activityTimeRestriction{ 0, "NONE", "", "", "qc", { static_cast(currentTimestamp), static_cast(currentTimestamp + 5) } }; auto forEachObjectTrigger = triggers::ForEachObject(CCDB_ENDPOINT, "qcdb", objectPath, activityTimeRestriction); BOOST_CHECK_EQUAL(forEachObjectTrigger(), TriggerType::ForEachObject); @@ -225,19 +225,19 @@ BOOST_AUTO_TEST_CASE(test_trigger_for_each_latest) // Send three objects with different metadata std::shared_ptr repository = DatabaseFactory::create("CCDB"); repository->connect(CCDB_ENDPOINT, "", "", ""); - mo->setActivity({ 100, 2, "FCC42x", "tpass1", "qc", gInvalidValidityInterval }); + mo->setActivity({ 100, "TECHNICAL", "FCC42x", "tpass1", "qc", gInvalidValidityInterval }); repository->storeMO(mo); usleep(1000); repository->storeMO(mo); - mo->setActivity({ 101, 2, "FCC42x", "tpass1", "qc", gInvalidValidityInterval }); + mo->setActivity({ 101, "TECHNICAL", "FCC42x", "tpass1", "qc", gInvalidValidityInterval }); repository->storeMO(mo); usleep(1000); repository->storeMO(mo); - mo->setActivity({ 100, 2, "FCC42x", "tpass2", "qc", gInvalidValidityInterval }); + mo->setActivity({ 100, "TECHNICAL", "FCC42x", "tpass2", "qc", gInvalidValidityInterval }); repository->storeMO(mo); { - const Activity activityAllRunsPass1{ 0, 2, "FCC42x", "tpass1", "qc" }; + const Activity activityAllRunsPass1{ 0, "TECHNICAL", "FCC42x", "tpass1", "qc" }; auto forEachObjectTrigger = triggers::ForEachLatest(CCDB_ENDPOINT, "qcdb", objectPath, activityAllRunsPass1); BOOST_CHECK_EQUAL(forEachObjectTrigger(), TriggerType::ForEachLatest); @@ -246,7 +246,7 @@ BOOST_AUTO_TEST_CASE(test_trigger_for_each_latest) } { - const Activity activityRun100AllPasses{ 100, 2, "FCC42x", "", "qc" }; + const Activity activityRun100AllPasses{ 100, "TECHNICAL", "FCC42x", "", "qc" }; auto forEachObjectTrigger = triggers::ForEachLatest(CCDB_ENDPOINT, "qcdb", objectPath, activityRun100AllPasses); BOOST_CHECK_EQUAL(forEachObjectTrigger(), TriggerType::ForEachLatest); @@ -255,7 +255,7 @@ BOOST_AUTO_TEST_CASE(test_trigger_for_each_latest) } { - const Activity activityAll{ 0, 0, "", "", "qc" }; + const Activity activityAll{ 0, "NONE", "", "", "qc" }; auto forEachObjectTrigger = triggers::ForEachLatest(CCDB_ENDPOINT, "qcdb", objectPath, activityAll); BOOST_CHECK_EQUAL(forEachObjectTrigger(), TriggerType::ForEachLatest); diff --git a/Framework/test/testWorkflow.json b/Framework/test/testWorkflow.json index 3ef46f8a9c..5008d73f48 100644 --- a/Framework/test/testWorkflow.json +++ b/Framework/test/testWorkflow.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/Benchmark/script/benchmarkPP.json b/Modules/Benchmark/script/benchmarkPP.json index 403c54ca53..7c497c4426 100644 --- a/Modules/Benchmark/script/benchmarkPP.json +++ b/Modules/Benchmark/script/benchmarkPP.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/CPV/etc/physics-full-no-sampling.json b/Modules/CPV/etc/physics-full-no-sampling.json index 4c0dd35c1f..0e65c36de1 100644 --- a/Modules/CPV/etc/physics-full-no-sampling.json +++ b/Modules/CPV/etc/physics-full-no-sampling.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/CPV/etc/physics-taskAndCheck-no-sampling.json b/Modules/CPV/etc/physics-taskAndCheck-no-sampling.json index 2985809e75..78b7d0f63d 100644 --- a/Modules/CPV/etc/physics-taskAndCheck-no-sampling.json +++ b/Modules/CPV/etc/physics-taskAndCheck-no-sampling.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/CPV/etc/read-raw-from-file/pedestal-task-no-sampling.json b/Modules/CPV/etc/read-raw-from-file/pedestal-task-no-sampling.json index bd34a66518..5823154989 100644 --- a/Modules/CPV/etc/read-raw-from-file/pedestal-task-no-sampling.json +++ b/Modules/CPV/etc/read-raw-from-file/pedestal-task-no-sampling.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/CPV/etc/read-raw-from-file/physics-taskOnly-no-sampling.json b/Modules/CPV/etc/read-raw-from-file/physics-taskOnly-no-sampling.json index dc7f994d93..dab6cb14e4 100644 --- a/Modules/CPV/etc/read-raw-from-file/physics-taskOnly-no-sampling.json +++ b/Modules/CPV/etc/read-raw-from-file/physics-taskOnly-no-sampling.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/CTP/basic-ctp.json b/Modules/CTP/basic-ctp.json index 984984f9ff..6dde42384d 100644 --- a/Modules/CTP/basic-ctp.json +++ b/Modules/CTP/basic-ctp.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/CTP/src/counters.json b/Modules/CTP/src/counters.json index bdcc547509..3a71acd085 100644 --- a/Modules/CTP/src/counters.json +++ b/Modules/CTP/src/counters.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/Common/etc/flagcollection-example.json b/Modules/Common/etc/flagcollection-example.json index 9d2e92688c..bf2e69b292 100644 --- a/Modules/Common/etc/flagcollection-example.json +++ b/Modules/Common/etc/flagcollection-example.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "periodName": "LHC42x", "": "Period name / Production tag - e.g. LHC22c, LHC22c1b_test", "passName": "spass", "": "Pass type - e.g. spass, cpass1", "provenance": "qc", "": "Provenance - qc or qc_mc depending whether it is normal data or monte carlo data" diff --git a/Modules/Common/etc/quality-example.json b/Modules/Common/etc/quality-example.json index 6e81847e69..1a9f25baa1 100644 --- a/Modules/Common/etc/quality-example.json +++ b/Modules/Common/etc/quality-example.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "periodName": "LHC42x", "": "Period name / Production tag - e.g. LHC22c, LHC22c1b_test", "passName": "spass", "": "Pass type - e.g. spass, cpass1", "provenance": "qc", "": "Provenance - qc or qc_mc depending whether it is normal data or monte carlo data" diff --git a/Modules/Daq/daq.json b/Modules/Daq/daq.json index 9af2c6459f..08bb5ed650 100644 --- a/Modules/Daq/daq.json +++ b/Modules/Daq/daq.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/EMCAL/etc/cells.json b/Modules/EMCAL/etc/cells.json index 411ab3c257..3608861a69 100644 --- a/Modules/EMCAL/etc/cells.json +++ b/Modules/EMCAL/etc/cells.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/EMCAL/etc/clusters-use-internal-clusterizer.json b/Modules/EMCAL/etc/clusters-use-internal-clusterizer.json index 867be16761..307792f811 100644 --- a/Modules/EMCAL/etc/clusters-use-internal-clusterizer.json +++ b/Modules/EMCAL/etc/clusters-use-internal-clusterizer.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/EMCAL/etc/clusters.json b/Modules/EMCAL/etc/clusters.json index 66e5d8ddf4..54c677c6f3 100644 --- a/Modules/EMCAL/etc/clusters.json +++ b/Modules/EMCAL/etc/clusters.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/EMCAL/etc/decodererrors.json b/Modules/EMCAL/etc/decodererrors.json index 15eaa2f676..17848831cb 100644 --- a/Modules/EMCAL/etc/decodererrors.json +++ b/Modules/EMCAL/etc/decodererrors.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "consul": { "url": "" diff --git a/Modules/EMCAL/etc/digits.json b/Modules/EMCAL/etc/digits.json index 843ffb993a..d45d62b977 100644 --- a/Modules/EMCAL/etc/digits.json +++ b/Modules/EMCAL/etc/digits.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/EMCAL/etc/readout-stfb-remote.json b/Modules/EMCAL/etc/readout-stfb-remote.json index 69a28e88b9..0d1a1753af 100644 --- a/Modules/EMCAL/etc/readout-stfb-remote.json +++ b/Modules/EMCAL/etc/readout-stfb-remote.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/EMCAL/etc/readout-stfb.json b/Modules/EMCAL/etc/readout-stfb.json index 4b1e44c685..880d016fb5 100644 --- a/Modules/EMCAL/etc/readout-stfb.json +++ b/Modules/EMCAL/etc/readout-stfb.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/EMCAL/etc/readout.json b/Modules/EMCAL/etc/readout.json index e87bc0c23a..f1f7c83370 100644 --- a/Modules/EMCAL/etc/readout.json +++ b/Modules/EMCAL/etc/readout.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/Example/etc/analysisDerived.json b/Modules/Example/etc/analysisDerived.json index d47399e05f..5b477d2e97 100644 --- a/Modules/Example/etc/analysisDerived.json +++ b/Modules/Example/etc/analysisDerived.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/Example/etc/analysisDirect.json b/Modules/Example/etc/analysisDirect.json index 6873d99f85..01ed25653f 100644 --- a/Modules/Example/etc/analysisDirect.json +++ b/Modules/Example/etc/analysisDirect.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/Example/etc/every-object.json b/Modules/Example/etc/every-object.json index 026b55edfd..be6536ceda 100644 --- a/Modules/Example/etc/every-object.json +++ b/Modules/Example/etc/every-object.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "periodName": "", "": "Period name - e.g. LHC22c, LHC22c1b_test", "passName": "", "": "Pass type - e.g. spass, cpass1", "provenance": "qc", "": "Provenance - qc or qc_mc depending whether it is normal data or monte carlo data" diff --git a/Modules/FIT/FT0/etc/recpoints_monitoring.json b/Modules/FIT/FT0/etc/recpoints_monitoring.json index 6b03e93132..124a98eedd 100644 --- a/Modules/FIT/FT0/etc/recpoints_monitoring.json +++ b/Modules/FIT/FT0/etc/recpoints_monitoring.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?METRIC" diff --git a/Modules/FIT/FT0/ft0-digits-qc.json b/Modules/FIT/FT0/ft0-digits-qc.json index 58accebec4..ea7d9aaf36 100644 --- a/Modules/FIT/FT0/ft0-digits-qc.json +++ b/Modules/FIT/FT0/ft0-digits-qc.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?METRIC" diff --git a/Modules/FIT/FT0/ft0-reconstruction-config.json b/Modules/FIT/FT0/ft0-reconstruction-config.json index b92305e724..ce2f2bb69e 100644 --- a/Modules/FIT/FT0/ft0-reconstruction-config.json +++ b/Modules/FIT/FT0/ft0-reconstruction-config.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "provenance": "qc_mc", "passName": "passMC", "periodName": "SimChallenge" diff --git a/Modules/FOCAL/etc/testbeam.json b/Modules/FOCAL/etc/testbeam.json index d755310a5a..a36f042bb5 100644 --- a/Modules/FOCAL/etc/testbeam.json +++ b/Modules/FOCAL/etc/testbeam.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/HMPID/src/readout.json b/Modules/HMPID/src/readout.json index 0a2c73aaba..3222a41750 100644 --- a/Modules/HMPID/src/readout.json +++ b/Modules/HMPID/src/readout.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/its.json b/Modules/ITS/its.json index 354519f459..5844763626 100644 --- a/Modules/ITS/its.json +++ b/Modules/ITS/its.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsCluster.json b/Modules/ITS/itsCluster.json index 86e9384275..e6a0360a38 100644 --- a/Modules/ITS/itsCluster.json +++ b/Modules/ITS/itsCluster.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsDecoding.json b/Modules/ITS/itsDecoding.json index 7fb563028b..c15156e0ee 100644 --- a/Modules/ITS/itsDecoding.json +++ b/Modules/ITS/itsDecoding.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsEPN.json b/Modules/ITS/itsEPN.json index eba9a0cf20..719c971fb6 100644 --- a/Modules/ITS/itsEPN.json +++ b/Modules/ITS/itsEPN.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsFLP.json b/Modules/ITS/itsFLP.json index 4b9a3b359a..49724de92b 100644 --- a/Modules/ITS/itsFLP.json +++ b/Modules/ITS/itsFLP.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsFee-no-ds.json b/Modules/ITS/itsFee-no-ds.json index 7bc1080e74..539128e5d1 100644 --- a/Modules/ITS/itsFee-no-ds.json +++ b/Modules/ITS/itsFee-no-ds.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsFee.json b/Modules/ITS/itsFee.json index b8690e34b7..e0f3f94ef7 100644 --- a/Modules/ITS/itsFee.json +++ b/Modules/ITS/itsFee.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsFhr.json b/Modules/ITS/itsFhr.json index 34622235bd..ebc86e5f69 100644 --- a/Modules/ITS/itsFhr.json +++ b/Modules/ITS/itsFhr.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsNoisyPixel.json b/Modules/ITS/itsNoisyPixel.json index 9dc3a1e369..d521de548c 100644 --- a/Modules/ITS/itsNoisyPixel.json +++ b/Modules/ITS/itsNoisyPixel.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsQCQualitySummary.json b/Modules/ITS/itsQCQualitySummary.json index 1640467d78..ae8816719a 100644 --- a/Modules/ITS/itsQCQualitySummary.json +++ b/Modules/ITS/itsQCQualitySummary.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsQCTrendingCluster.json b/Modules/ITS/itsQCTrendingCluster.json index 4fe88b0ca0..e11d2a4aad 100644 --- a/Modules/ITS/itsQCTrendingCluster.json +++ b/Modules/ITS/itsQCTrendingCluster.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsQCTrendingFEE.json b/Modules/ITS/itsQCTrendingFEE.json index 8338228b6a..221ea303aa 100644 --- a/Modules/ITS/itsQCTrendingFEE.json +++ b/Modules/ITS/itsQCTrendingFEE.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsQCTrendingFhr.json b/Modules/ITS/itsQCTrendingFhr.json index 2d55be380c..8c73da73d4 100644 --- a/Modules/ITS/itsQCTrendingFhr.json +++ b/Modules/ITS/itsQCTrendingFhr.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsQCTrendingTracks.json b/Modules/ITS/itsQCTrendingTracks.json index 6a3c19220a..59568521e7 100644 --- a/Modules/ITS/itsQCTrendingTracks.json +++ b/Modules/ITS/itsQCTrendingTracks.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ITS/itsTrack.json b/Modules/ITS/itsTrack.json index 184843b986..fb48c9f02d 100644 --- a/Modules/ITS/itsTrack.json +++ b/Modules/ITS/itsTrack.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/MUON/Common/etc/qc-tracks-mch.json b/Modules/MUON/Common/etc/qc-tracks-mch.json index 7e4de4cf1f..79c9098f09 100644 --- a/Modules/MUON/Common/etc/qc-tracks-mch.json +++ b/Modules/MUON/Common/etc/qc-tracks-mch.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/Common/etc/qc-tracks-mchmid.json b/Modules/MUON/Common/etc/qc-tracks-mchmid.json index 8c6e915541..b9a6d7a826 100644 --- a/Modules/MUON/Common/etc/qc-tracks-mchmid.json +++ b/Modules/MUON/Common/etc/qc-tracks-mchmid.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/Common/etc/qc-tracks-mftmch.json b/Modules/MUON/Common/etc/qc-tracks-mftmch.json index 511de60f50..0807a8a8a8 100644 --- a/Modules/MUON/Common/etc/qc-tracks-mftmch.json +++ b/Modules/MUON/Common/etc/qc-tracks-mftmch.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/Common/etc/qc-tracks-mftmchmid.json b/Modules/MUON/Common/etc/qc-tracks-mftmchmid.json index f33b941a23..903429d23c 100644 --- a/Modules/MUON/Common/etc/qc-tracks-mftmchmid.json +++ b/Modules/MUON/Common/etc/qc-tracks-mftmchmid.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/MCH/etc/qc-errors.json b/Modules/MUON/MCH/etc/qc-errors.json index f4fade5d9f..adbd563e81 100644 --- a/Modules/MUON/MCH/etc/qc-errors.json +++ b/Modules/MUON/MCH/etc/qc-errors.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/MCH/etc/qc-mch-clusters.json b/Modules/MUON/MCH/etc/qc-mch-clusters.json index 819f5eeb55..7980b9f36f 100644 --- a/Modules/MUON/MCH/etc/qc-mch-clusters.json +++ b/Modules/MUON/MCH/etc/qc-mch-clusters.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/MCH/etc/qc-mch-decoding.json b/Modules/MUON/MCH/etc/qc-mch-decoding.json index 15d444d8cf..b4a8b7254a 100644 --- a/Modules/MUON/MCH/etc/qc-mch-decoding.json +++ b/Modules/MUON/MCH/etc/qc-mch-decoding.json @@ -11,7 +11,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/MCH/etc/qc-mch-digits.json b/Modules/MUON/MCH/etc/qc-mch-digits.json index 9be4deaa18..e660008c97 100644 --- a/Modules/MUON/MCH/etc/qc-mch-digits.json +++ b/Modules/MUON/MCH/etc/qc-mch-digits.json @@ -11,7 +11,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/MCH/etc/qc-mch-preclusters.json b/Modules/MUON/MCH/etc/qc-mch-preclusters.json index 9c1a7992c2..fe5cd03008 100644 --- a/Modules/MUON/MCH/etc/qc-mch-preclusters.json +++ b/Modules/MUON/MCH/etc/qc-mch-preclusters.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/MCH/etc/qc-tracks.json b/Modules/MUON/MCH/etc/qc-tracks.json index a441ad1eae..ecf8cf8467 100644 --- a/Modules/MUON/MCH/etc/qc-tracks.json +++ b/Modules/MUON/MCH/etc/qc-tracks.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/MCH/etc/qc-trending-tracks.json b/Modules/MUON/MCH/etc/qc-trending-tracks.json index 0dd44e7835..b68835cb79 100644 --- a/Modules/MUON/MCH/etc/qc-trending-tracks.json +++ b/Modules/MUON/MCH/etc/qc-trending-tracks.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "postprocessing": { diff --git a/Modules/MUON/MID/mid-digits.json b/Modules/MUON/MID/mid-digits.json index c585040818..7abc3cc8fe 100644 --- a/Modules/MUON/MID/mid-digits.json +++ b/Modules/MUON/MID/mid-digits.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" } }, "tasks": { diff --git a/Modules/MUON/MID/mid-raw.json b/Modules/MUON/MID/mid-raw.json index bd1c5f3291..3baa943f52 100755 --- a/Modules/MUON/MID/mid-raw.json +++ b/Modules/MUON/MID/mid-raw.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PHOS/etc/phosCalib.json b/Modules/PHOS/etc/phosCalib.json index 4ca28ad2ad..375fe19427 100644 --- a/Modules/PHOS/etc/phosCalib.json +++ b/Modules/PHOS/etc/phosCalib.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PHOS/etc/phosCalibLED.json b/Modules/PHOS/etc/phosCalibLED.json index 4baeb3adfe..4f56cd8b42 100644 --- a/Modules/PHOS/etc/phosCalibLED.json +++ b/Modules/PHOS/etc/phosCalibLED.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PHOS/etc/phosCalibPed.json b/Modules/PHOS/etc/phosCalibPed.json index 1b9a64d069..a8adc2ca5d 100644 --- a/Modules/PHOS/etc/phosCalibPed.json +++ b/Modules/PHOS/etc/phosCalibPed.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PHOS/etc/phosClusters.json b/Modules/PHOS/etc/phosClusters.json index 6c3cf73bbb..6c055a8001 100644 --- a/Modules/PHOS/etc/phosClusters.json +++ b/Modules/PHOS/etc/phosClusters.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PHOS/etc/phosPedestal.json b/Modules/PHOS/etc/phosPedestal.json index 0bcf2479a9..d290fec561 100644 --- a/Modules/PHOS/etc/phosPedestal.json +++ b/Modules/PHOS/etc/phosPedestal.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PHOS/etc/phosRaw.json b/Modules/PHOS/etc/phosRaw.json index fbc01c1dbe..763fb2b98f 100644 --- a/Modules/PHOS/etc/phosRaw.json +++ b/Modules/PHOS/etc/phosRaw.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PHOS/etc/phosRawClu.json b/Modules/PHOS/etc/phosRawClu.json index 3d9a7f34c3..dcdab985db 100644 --- a/Modules/PHOS/etc/phosRawClu.json +++ b/Modules/PHOS/etc/phosRawClu.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PID/pidft0tof.json b/Modules/PID/pidft0tof.json index 7d06cb6ac3..aa7f8cb2c4 100644 --- a/Modules/PID/pidft0tof.json +++ b/Modules/PID/pidft0tof.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/PID/pidtof.json b/Modules/PID/pidtof.json index bb9f9d46cb..cc1638674b 100644 --- a/Modules/PID/pidtof.json +++ b/Modules/PID/pidtof.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/tofcosmics.json b/Modules/TOF/tofcosmics.json index 9e41dc3e69..562446a8e6 100644 --- a/Modules/TOF/tofcosmics.json +++ b/Modules/TOF/tofcosmics.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/tofdigits.json b/Modules/TOF/tofdigits.json index daae05cd2a..a7b589cba7 100644 --- a/Modules/TOF/tofdigits.json +++ b/Modules/TOF/tofdigits.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/tofdigits_multinode.json b/Modules/TOF/tofdigits_multinode.json index a82662a7e5..ecc375ac5b 100644 --- a/Modules/TOF/tofdigits_multinode.json +++ b/Modules/TOF/tofdigits_multinode.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/toffull.json b/Modules/TOF/toffull.json index 59d088d103..8b5101ca10 100644 --- a/Modules/TOF/toffull.json +++ b/Modules/TOF/toffull.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/toffull_multinode.json b/Modules/TOF/toffull_multinode.json index 6717ad842b..9948186344 100644 --- a/Modules/TOF/toffull_multinode.json +++ b/Modules/TOF/toffull_multinode.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/tofpostprocessdiagnosticpercrate.json b/Modules/TOF/tofpostprocessdiagnosticpercrate.json index 4bfbb4dbc3..85c4223be4 100644 --- a/Modules/TOF/tofpostprocessdiagnosticpercrate.json +++ b/Modules/TOF/tofpostprocessdiagnosticpercrate.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/tofraw.json b/Modules/TOF/tofraw.json index 5e2020457d..815aba77b1 100644 --- a/Modules/TOF/tofraw.json +++ b/Modules/TOF/tofraw.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/tofraw_multinode.json b/Modules/TOF/tofraw_multinode.json index 276fbfd4f6..ae944055b8 100644 --- a/Modules/TOF/tofraw_multinode.json +++ b/Modules/TOF/tofraw_multinode.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/toftrending.json b/Modules/TOF/toftrending.json index 82105f71f6..b02a854357 100644 --- a/Modules/TOF/toftrending.json +++ b/Modules/TOF/toftrending.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TOF/toftrendingrate.json b/Modules/TOF/toftrendingrate.json index d0989e1aff..e5df295eb3 100644 --- a/Modules/TOF/toftrendingrate.json +++ b/Modules/TOF/toftrendingrate.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCCalDetPublisher.json b/Modules/TPC/run/tpcQCCalDetPublisher.json index be16967479..9c0febd181 100644 --- a/Modules/TPC/run/tpcQCCalDetPublisher.json +++ b/Modules/TPC/run/tpcQCCalDetPublisher.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCCheckTrending_laserCalib.json b/Modules/TPC/run/tpcQCCheckTrending_laserCalib.json index 8f6c92600b..2c910b0375 100644 --- a/Modules/TPC/run/tpcQCCheckTrending_laserCalib.json +++ b/Modules/TPC/run/tpcQCCheckTrending_laserCalib.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCClusterVisualizer.json b/Modules/TPC/run/tpcQCClusterVisualizer.json index b9d19a0a1b..95015deab8 100644 --- a/Modules/TPC/run/tpcQCClusterVisualizer.json +++ b/Modules/TPC/run/tpcQCClusterVisualizer.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCClusters_direct.json b/Modules/TPC/run/tpcQCClusters_direct.json index ff6c8cc32e..37509e8539 100644 --- a/Modules/TPC/run/tpcQCClusters_direct.json +++ b/Modules/TPC/run/tpcQCClusters_direct.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCKrClusters_direct.json b/Modules/TPC/run/tpcQCKrClusters_direct.json index 978a7a7c8a..6581eb6fa5 100644 --- a/Modules/TPC/run/tpcQCKrClusters_direct.json +++ b/Modules/TPC/run/tpcQCKrClusters_direct.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCLaserTracks.json b/Modules/TPC/run/tpcQCLaserTracks.json index e44ba4c04d..9b9bb5d0ca 100644 --- a/Modules/TPC/run/tpcQCLaserTracks.json +++ b/Modules/TPC/run/tpcQCLaserTracks.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCPID_direct.json b/Modules/TPC/run/tpcQCPID_direct.json index 4fa361ce8f..a09db8b4f1 100644 --- a/Modules/TPC/run/tpcQCPID_direct.json +++ b/Modules/TPC/run/tpcQCPID_direct.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCPID_sampled.json b/Modules/TPC/run/tpcQCPID_sampled.json index b54fd7a4a5..095b2f3cf0 100644 --- a/Modules/TPC/run/tpcQCPID_sampled.json +++ b/Modules/TPC/run/tpcQCPID_sampled.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCPadCalibration.json b/Modules/TPC/run/tpcQCPadCalibration.json index e10b94272f..ed51a3b5cc 100644 --- a/Modules/TPC/run/tpcQCPadCalibration.json +++ b/Modules/TPC/run/tpcQCPadCalibration.json @@ -11,7 +11,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCPadCalibration_GenericPad.json b/Modules/TPC/run/tpcQCPadCalibration_GenericPad.json index 6ef6ee3e15..c06af5dc01 100644 --- a/Modules/TPC/run/tpcQCPadCalibration_GenericPad.json +++ b/Modules/TPC/run/tpcQCPadCalibration_GenericPad.json @@ -11,7 +11,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCRawDigitVisualizer.json b/Modules/TPC/run/tpcQCRawDigitVisualizer.json index ee33d2d3b9..6fc541086c 100644 --- a/Modules/TPC/run/tpcQCRawDigitVisualizer.json +++ b/Modules/TPC/run/tpcQCRawDigitVisualizer.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCRawDigits_direct.json b/Modules/TPC/run/tpcQCRawDigits_direct.json index adfff9a13f..aa92d79f5f 100644 --- a/Modules/TPC/run/tpcQCRawDigits_direct.json +++ b/Modules/TPC/run/tpcQCRawDigits_direct.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCSimpleTrending.json b/Modules/TPC/run/tpcQCSimpleTrending.json index 8002fc0ff6..c703b930e5 100644 --- a/Modules/TPC/run/tpcQCSimpleTrending.json +++ b/Modules/TPC/run/tpcQCSimpleTrending.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCTasks_multinode.json b/Modules/TPC/run/tpcQCTasks_multinode.json index 6a63b29fea..2f6857b2a0 100644 --- a/Modules/TPC/run/tpcQCTasks_multinode.json +++ b/Modules/TPC/run/tpcQCTasks_multinode.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCTrackingFromExternal_direct.json b/Modules/TPC/run/tpcQCTrackingFromExternal_direct.json index 797809e124..b343e0917d 100644 --- a/Modules/TPC/run/tpcQCTrackingFromExternal_direct.json +++ b/Modules/TPC/run/tpcQCTrackingFromExternal_direct.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCTracking_direct.json b/Modules/TPC/run/tpcQCTracking_direct.json index 0d3ef800c0..62b9d35fe3 100644 --- a/Modules/TPC/run/tpcQCTracking_direct.json +++ b/Modules/TPC/run/tpcQCTracking_direct.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCTracks_Generic.json b/Modules/TPC/run/tpcQCTracks_Generic.json index 8728bc0594..afc36561a2 100644 --- a/Modules/TPC/run/tpcQCTracks_Generic.json +++ b/Modules/TPC/run/tpcQCTracks_Generic.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCTrending.json b/Modules/TPC/run/tpcQCTrending.json index e7adf5003b..63b5756093 100644 --- a/Modules/TPC/run/tpcQCTrending.json +++ b/Modules/TPC/run/tpcQCTrending.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TPC/run/tpcQCTrending_laserCalib.json b/Modules/TPC/run/tpcQCTrending_laserCalib.json index c8523bdcaf..b8f6420950 100644 --- a/Modules/TPC/run/tpcQCTrending_laserCalib.json +++ b/Modules/TPC/run/tpcQCTrending_laserCalib.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TRD/TRDQC.json b/Modules/TRD/TRDQC.json index 1c490397aa..947d64e845 100644 --- a/Modules/TRD/TRDQC.json +++ b/Modules/TRD/TRDQC.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "123456", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/TRD/TRDpostprocessing.json b/Modules/TRD/TRDpostprocessing.json index 0b1560f3a9..5617f2ab31 100644 --- a/Modules/TRD/TRDpostprocessing.json +++ b/Modules/TRD/TRDpostprocessing.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "passName": "", "periodName" : "" diff --git a/Modules/TRD/TrackletPerTriggerCheck.json b/Modules/TRD/TrackletPerTriggerCheck.json index beecf79cac..123ffecfb3 100644 --- a/Modules/TRD/TrackletPerTriggerCheck.json +++ b/Modules/TRD/TrackletPerTriggerCheck.json @@ -11,7 +11,7 @@ }, "Activity": { "number": "42", - "type": "2", + "type": "NONE", "periodName": "", "": "Period name - e.g. LHC22c, LHC22c1b_test", "passName": "", "": "Pass type - e.g. spass, cpass1", "provenance": "qc", "": "Provenance - qc or qc_mc depending whether it is normal data or monte carlo data" diff --git a/Modules/ZDC/etc/zdcTaskRawData.json b/Modules/ZDC/etc/zdcTaskRawData.json index 6519dbafd5..8b1c140279 100755 --- a/Modules/ZDC/etc/zdcTaskRawData.json +++ b/Modules/ZDC/etc/zdcTaskRawData.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/Modules/ZDC/etc/zdcTaskRecData.json b/Modules/ZDC/etc/zdcTaskRecData.json index bba78ca6aa..566e996163 100755 --- a/Modules/ZDC/etc/zdcTaskRecData.json +++ b/Modules/ZDC/etc/zdcTaskRecData.json @@ -10,7 +10,7 @@ }, "Activity": { "number": "42", - "type": "2" + "type": "NONE" }, "monitoring": { "url": "infologger:///debug?qc" diff --git a/doc/Advanced.md b/doc/Advanced.md index 10ebf7d52f..abc43de603 100644 --- a/doc/Advanced.md +++ b/doc/Advanced.md @@ -1378,7 +1378,7 @@ should not be present in real configuration files. "Activity": { "": ["Configuration of a QC Activity (Run). This structure is subject to", "change or the values might come from other source (e.g. ECS+Bookkeeping)." ], "number": "42", "": "Activity number.", - "type": "2", "": "Arbitrary activity type.", + "type": "PHYSICS", "": "Activity type.", "periodName": "", "": "Period name - e.g. LHC22c, LHC22c1b_test", "passName": "", "": "Pass type - e.g. spass, cpass1", "provenance": "qc", "": "Provenance - qc or qc_mc depending whether it is normal data or monte carlo data", diff --git a/doc/ModulesDevelopment.md b/doc/ModulesDevelopment.md index fb1e980a72..8959b90c55 100644 --- a/doc/ModulesDevelopment.md +++ b/doc/ModulesDevelopment.md @@ -553,7 +553,7 @@ one can set it in the config file: ```yaml "Activity": { "number": "42", - "type": "2", + "type": "NONE", "periodName": "", "": "Period name - e.g. LHC22c, LHC22c1b_test", "passName": "", "": "Pass type - e.g. spass, cpass1", "provenance": "qc", "": "Provenance - qc or qc_mc"