Skip to content

Commit de5d0cc

Browse files
committed
[MCH] removed custom code for reference plots
* remove the custom MCH code for loading reference plots and comparing with actual data * store directly histograms instead of TCanvas objects for several plots
1 parent 2603c31 commit de5d0cc

20 files changed

+52
-467
lines changed

Modules/MUON/MCH/include/MCH/ClusterChargePlotter.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace muonchambers
3636
class ClusterChargePlotter : public HistPlotter
3737
{
3838
public:
39-
ClusterChargePlotter(std::string path, TH2F* hRef, bool fullPlots = false);
39+
ClusterChargePlotter(std::string path, bool fullPlots = false);
4040

4141
void update(TH2F* hCharge);
4242

@@ -62,9 +62,6 @@ class ClusterChargePlotter : public HistPlotter
6262
std::unique_ptr<ClusterChargeReductor> mChargeReductor;
6363

6464
std::unique_ptr<TH1F> mHistogramChargePerDE;
65-
std::unique_ptr<TH1F> mHistogramChargePerDERef;
66-
std::unique_ptr<TH1F> mHistogramChargeRefRatio;
67-
std::unique_ptr<TCanvas> mCanvasChargePerDE;
6865
std::array<std::unique_ptr<TH1F>, getNumDE()> mHistogramCharge;
6966
};
7067

Modules/MUON/MCH/include/MCH/ClusterChargeTrendsPlotter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace muonchambers
3535
class ClusterChargeTrendsPlotter : public HistPlotter
3636
{
3737
public:
38-
ClusterChargeTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
38+
ClusterChargeTrendsPlotter(std::string path, bool fullPlots = false);
3939

4040
void update(long time, TH2F* hEfficiency);
4141

Modules/MUON/MCH/include/MCH/ClusterSizePlotter.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace muonchambers
3737
class ClusterSizePlotter : public HistPlotter
3838
{
3939
public:
40-
ClusterSizePlotter(std::string path, TH2F* hRef, bool fullPlots = false);
40+
ClusterSizePlotter(std::string path, bool fullPlots = false);
4141

4242
void update(TH2F* hCharge);
4343

@@ -52,9 +52,6 @@ class ClusterSizePlotter : public HistPlotter
5252
std::unique_ptr<ClusterSizeReductor> mClusterSizeReductor;
5353

5454
std::array<std::unique_ptr<TH1F>, 3> mHistogramClusterSizePerDE;
55-
std::array<std::unique_ptr<TH1F>, 3> mHistogramClusterSizePerDERef;
56-
std::array<std::unique_ptr<TH1F>, 3> mHistogramClusterSizePerDERefRatio;
57-
std::array<std::unique_ptr<TCanvas>, 3> mCanvasClusterSizePerDE;
5855
std::array<std::unique_ptr<TH1F>, getNumDE() * 3> mHistogramClusterSize;
5956
std::array<std::unique_ptr<TLegend>, getNumDE()> mLegendClusterSize;
6057
std::array<std::unique_ptr<TCanvas>, getNumDE()> mCanvasClusterSize;

Modules/MUON/MCH/include/MCH/ClusterSizeTrendsPlotter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace muonchambers
3636
class ClusterSizeTrendsPlotter : public HistPlotter
3737
{
3838
public:
39-
ClusterSizeTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
39+
ClusterSizeTrendsPlotter(std::string path, bool fullPlots = false);
4040

4141
void update(long time, TH2F* hEfficiency);
4242

Modules/MUON/MCH/include/MCH/DigitsPostProcessing.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class DigitsPostProcessing : public PostProcessingInterface
7171

7272
// CCDB object accessors
7373
std::map<std::string, CcdbObjectHelper> mCcdbObjects;
74-
std::map<std::string, CcdbObjectHelper> mCcdbObjectsRef;
7574

7675
// Hit rate histograms ===============================================
7776

Modules/MUON/MCH/include/MCH/EfficiencyPlotter.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace muonchambers
3535
class EfficiencyPlotter : public HistPlotter
3636
{
3737
public:
38-
EfficiencyPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
38+
EfficiencyPlotter(std::string path, bool fullPlots = false);
3939

4040
void update(TH2F* hEfficiency);
4141

@@ -69,9 +69,6 @@ class EfficiencyPlotter : public HistPlotter
6969
std::unique_ptr<TH2ElecMapReductor> mElecMapReductor;
7070

7171
std::array<std::unique_ptr<TH1F>, 2> mHistogramMeanEfficiencyPerDE;
72-
std::array<std::unique_ptr<TH1F>, 2> mHistogramMeanEfficiencyPerDERef;
73-
std::array<std::unique_ptr<TH1F>, 2> mHistogramMeanEfficiencyRefRatio;
74-
std::array<std::unique_ptr<TCanvas>, 2> mCanvasMeanEfficiencyPerDE;
7572

7673
std::array<std::map<int, std::shared_ptr<DetectorHistogram>>, 2> mHistogramEfficiencyDE; // 2D hit rate map for each DE
7774
std::array<std::unique_ptr<GlobalHistogram>, 2> mHistogramEfficiencyGlobal; // Efficiency histogram (global XY view)

Modules/MUON/MCH/include/MCH/EfficiencyTrendsPlotter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace muonchambers
3535
class EfficiencyTrendsPlotter : public HistPlotter
3636
{
3737
public:
38-
EfficiencyTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
38+
EfficiencyTrendsPlotter(std::string path, bool fullPlots = false);
3939

4040
void update(long time, TH2F* hEfficiency);
4141

Modules/MUON/MCH/include/MCH/PreclustersPostProcessing.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,12 @@ class PreclustersPostProcessing : public PostProcessingInterface
7373
static std::string clusterChargeSourceName() { return "clcharge"; }
7474
static std::string clusterSizeSourceName() { return "clsize"; }
7575

76-
// PreclustersConfig mConfig;
77-
int64_t mRefTimeStamp{ 0 };
7876
bool mFullHistos{ false };
7977

8078
PostProcessingConfigMCH mConfig;
8179

8280
// CCDB object accessors
8381
std::map<std::string, CcdbObjectHelper> mCcdbObjects;
84-
std::map<std::string, CcdbObjectHelper> mCcdbObjectsRef;
8582

8683
// Hit rate histograms ===============================================
8784

Modules/MUON/MCH/include/MCH/RatesPlotter.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace muonchambers
3535
class RatesPlotter : public HistPlotter
3636
{
3737
public:
38-
RatesPlotter(std::string path, TH2F* hRef, float rateMin, float rateMax, bool perStationPlots = false, bool fullPlots = false);
38+
RatesPlotter(std::string path, float rateMin, float rateMax, bool perStationPlots = false, bool fullPlots = false);
3939

4040
void update(TH2F* hRates);
4141

@@ -69,14 +69,8 @@ class RatesPlotter : public HistPlotter
6969
std::unique_ptr<TH2F> mHistogramRatePerStation;
7070

7171
std::unique_ptr<TH1F> mHistogramMeanRatePerDE;
72-
std::unique_ptr<TH1F> mHistogramMeanRatePerDERef;
73-
std::unique_ptr<TH1F> mHistogramMeanRateRefRatio;
74-
std::unique_ptr<TCanvas> mCanvasMeanRatePerDE;
7572

7673
std::unique_ptr<TH1F> mHistogramGoodChannelsFractionPerDE;
77-
std::unique_ptr<TH1F> mHistogramGoodChannelsFractionPerDERef;
78-
std::unique_ptr<TH1F> mHistogramGoodChannelsFractionRefRatio;
79-
std::unique_ptr<TCanvas> mCanvasGoodChannelsFractionPerDE;
8074

8175
std::map<int, std::shared_ptr<DetectorHistogram>> mHistogramRateDE[2]; // 2D hit rate map for each DE
8276
std::shared_ptr<GlobalHistogram> mHistogramRateGlobal[2]; // Rate histogram (global XY view)

Modules/MUON/MCH/include/MCH/RatesTrendsPlotter.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace muonchambers
3636
class RatesTrendsPlotter : public HistPlotter
3737
{
3838
public:
39-
RatesTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
39+
RatesTrendsPlotter(std::string path, bool fullPlots = false);
4040

4141
void update(long time, TH2F* hEfficiency);
4242

@@ -51,11 +51,9 @@ class RatesTrendsPlotter : public HistPlotter
5151

5252
// Data reductor
5353
std::unique_ptr<TH2ElecMapReductor> mReductor;
54-
std::array<std::optional<float>, getNumDE()> mRefValues;
5554
// Trend plots
5655
std::unique_ptr<TrendGraph> mOrbits;
5756
std::array<std::unique_ptr<TrendGraph>, getNumDE()> mTrendsDE;
58-
std::array<std::unique_ptr<TrendGraph>, getNumDE()> mTrendsRefRatioDE;
5957
std::array<std::unique_ptr<TrendGraph>, 10> mTrendsChamber;
6058
std::unique_ptr<TrendMultiGraph> mTrends;
6159
};

0 commit comments

Comments
 (0)