Skip to content

Commit 5ac7250

Browse files
lhusovaLucia Anna Tarasovicova
authored and
Barthelemy
committed
CTP: change in the task, check and trending (#2454)
* change of the parameter read out in Raw QC task * change of the parameter read out in the check * change of the parameter read out + consistent input names * trending plots generated based on the varexp * add token also for MB input1 * simplification and assuring of default names * histogram labels from CTPInputsConfiguration * change of the read out of the parameters in Check * fix --------- Co-authored-by: Lucia Anna Tarasovicova <lucia.anna.husova@cern.ch>
1 parent 7e7076f commit 5ac7250

6 files changed

Lines changed: 149 additions & 135 deletions

File tree

‎Modules/CTP/include/CTP/CTPTrendingTask.h‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,21 @@ class CTPTrendingTask : public PostProcessingInterface
6262
MetaData mMetaData;
6363
UInt_t mTime; // this is not a specific time, used for x axis in trending plots, this name is used in all other modules, please suggest a new name if not appropriate
6464

65-
std::string mInputNamesDefault[5] = { "TVX", "VBA", "DMC", "EMC", "PH0" }; // ctp inputs to be trended by default, unless modified in config.json
66-
std::string ctpinputs[49] = { " T0A", " T0C", " TVX", " TSC", " TCE", " VBA", " VOR", " VIR", " VNC", " VCH", "11", "12", " UCE", "DMC", " USC", " UVX", " U0C", " U0A", "COS", "LAS", "EMC", " PH0", "23", "24", "ZED", "ZNC", "PHL", "PHH", "PHM", "30", "31", "32", "33", "34", "35", "36", "EJ1", "EJ2", "EG1", "EG2", "DJ1", "DG1", "DJ2", "DG2", "45", "46", "47", "48", "49" }; // all ctp input names
67-
std::string mClassNamesDefault[5] = { "CMTVX-B-NOPF", "CMVBA-B-NOPF", "CTVXDMC-B-NOPF-EMC", "CTVXEMC-B-NOPF-EMC", "CTVXPH0-B-NOPF-PHSCPV" }; // ctp classes to be trended by default, unless modified in config.json
68-
std::string mClassNames[5] = { "", "", "", "", "" }; // the trended ctp classes will be filled in this array, either default or from config
69-
std::string mInputNames[5] = { "", "", "", "", "" }; // the trended ctp inputs will be filled in this array, either default or from config
70-
const int mNumberOfClasses = 5; // number of thrended ctp classes
71-
const int mNumberOfInputs = 5; // number of thrended ctp inputs
72-
int mClassIndex[5] = { 65, 65, 65, 65, 65 }; // indices of trended ctp classes, found in CTPconfig
73-
int mInputIndex[5] = { 49, 49, 49, 49, 49 }; // indices of trended ctp inputs, found in CTPconfig
74-
bool mCTPconfigFound = false; // bool telling whether the CTPconfing was already found
65+
std::string mInputNamesDefault[5] = { "MTVX", "MVBA", "0DMC", "0EMC", "0PH0" }; // ctp inputs to be trended by default, unless modified in config.json
66+
std::string mTrendedInputNames[5] = { "inputContentMinBias1:time", "inputContentMinBias2:time", "inputContentDMC:time", "inputContentEMC:time", "inputContentPHO:time" };
67+
std::string mTrendedClassNames[5] = { "classContentMinBias1:time", "classContentMinBias2:time", "classContentDMC:time", "classContentEMC:time", "classContentPHO:time" };
68+
std::string mTrendedInputRatioNames[4] = { "inputContentMinBias2/inputs", "inputContentDMC/inputs", "inputContentEMC/inputs", "inputContentPHO/inputs" };
69+
std::string mTrendedClassRatioNames[4] = { "classContentMinBias2/classes", "classContentDMC/classes", "classContentEMC/classes", "classContentPHO/classes" };
70+
std::string mClassNamesDefault[5] = { "CMTVX-B-NOPF", "CMVBA-B-NOPF", "CTVXDMC-B-NOPF-EMC", "CTVXEMC-B-NOPF-EMC", "CTVXPH0-B-NOPF-PHSCPV" }; // ctp classes to be trended by default, unless modified in config.json
71+
std::string mClassNames[5] = { "", "", "", "", "" }; // the trended ctp classes will be filled in this array, either default or from config
72+
std::string mInputNames[5] = { "", "", "", "", "" }; // the trended ctp inputs will be filled in this array, either default or from config
73+
std::string mInputParameters[5] = { "minBias1Input", "minBias2Input", "minBisDMCInput", "minBiasEMCInput", "minBiasPHOInput" };
74+
std::string mClassParameters[5] = { "minBias1Class", "minBias2Class", "minBisDMCclass", "minBiasEMCclass", "minBiasPHOclass" };
75+
const int mNumberOfClasses = 5; // number of thrended ctp classes
76+
const int mNumberOfInputs = 5; // number of thrended ctp inputs
77+
int mClassIndex[5] = { 65, 65, 65, 65, 65 }; // indices of trended ctp classes, found in CTPconfig
78+
int mInputIndex[5] = { 49, 49, 49, 49, 49 }; // indices of trended ctp inputs, found in CTPconfig
79+
bool mCTPconfigFound = false; // bool telling whether the CTPconfing was already found
7580

7681
std::map<std::string, TObject*> mPlots;
7782

‎Modules/CTP/include/CTP/RawDataQcTask.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ class CTPRawDataReaderTask final : public TaskInterface
6161
int indexMB2 = -1;
6262
static const int ninps = o2::ctp::CTP_NINPUTS + 1;
6363
static const int nclasses = o2::ctp::CTP_NCLASSES + 1;
64+
double mScaleInput1 = 1;
65+
double mScaleInput2 = 1;
6466
long int mTimestamp;
6567
std::string classNames[nclasses];
6668
int mIndexMBclass = -1; // index for the MB ctp class, which is used as scaling for the ratios

‎Modules/CTP/include/CTP/RawDataReaderCheck.h‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,15 @@ class RawDataReaderCheck : public o2::quality_control::checker::CheckInterface
6565
TH1D* mHistClassesPrevious = nullptr; // histogram storing ctp class rates from previous cycle
6666
TH1D* mHistInputRatioPrevious = nullptr; // histogram storing ctp input ratios to MB from previous cycle
6767
TH1D* mHistClassRatioPrevious = nullptr;
68-
TH1D* mHistAbsolute = nullptr; // histogram storing ctp class ratios to MB from previous cycle
69-
std::vector<int> mVecGoodBC; // vector of good BC positions
70-
std::vector<int> mVecMediumBC; // vector of medium BC positions, we expect a BC at this position, but inputs are below mThreshold
71-
std::vector<int> mVecBadBC; // vector of bad BC positions, we don't expect a BC at this position, but inputs are abow mThreshold
72-
std::vector<int> mVecIndexBad; // vector of ctp input and class indices, which had a big relative change
73-
std::vector<int> mVecIndexMedium; // vector of ctp input and class indices, which had a relative change
74-
std::bitset<o2::constants::lhc::LHCMaxBunches> mLHCBCs; // LHC filling scheme
75-
const char* ctpinputs[49] = { " T0A", " T0C", " TVX", " TSC", " TCE", " VBA", " VOR", " VIR", " VNC", " VCH", "11", "12", " UCE", "DMC", " USC", " UVX", " U0C", " U0A", "COS", "LAS", "EMC", " PH0", "23", "24", "ZED", "ZNC", "PHL", "PHH", "PHM", "30", "31", "32", "33", "34", "35", "36", "EJ1", "EJ2", "EG1", "EG2", "DJ1", "DG1", "DJ2", "DG2", "45", "46", "47", "48", "49" }; // ctp input names
68+
TH1D* mHistAbsolute = nullptr; // histogram storing ctp class ratios to MB from previous cycle
69+
std::vector<int> mVecGoodBC; // vector of good BC positions
70+
std::vector<int> mVecMediumBC; // vector of medium BC positions, we expect a BC at this position, but inputs are below mThreshold
71+
std::vector<int> mVecBadBC; // vector of bad BC positions, we don't expect a BC at this position, but inputs are abow mThreshold
72+
std::vector<int> mVecIndexBad; // vector of ctp input and class indices, which had a big relative change
73+
std::vector<int> mVecIndexMedium; // vector of ctp input and class indices, which had a relative change
74+
std::bitset<o2::constants::lhc::LHCMaxBunches> mLHCBCs; // LHC filling scheme
7675

77-
ClassDefOverride(RawDataReaderCheck, 8);
76+
ClassDefOverride(RawDataReaderCheck, 9);
7877
};
7978

8079
} // namespace o2::quality_control_modules::ctp

0 commit comments

Comments
 (0)