Index: trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.cc =================================================================== --- trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.cc (revision 1996) +++ trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.cc (revision 1997) @@ -93,34 +93,34 @@ fTitle = title ? title : "Trigger L2 image parameters"; - hfLutPseudoSize = new TH1F("hfLutPseudoSize", "number of compact pixels in one lut", 13, 0, 12); - hfPseudoSize = new TH1F("hfPseudoSize", "Multiplicity of the cluster identified by the L2T", 13, 0, 12); - hfSizeBiggerCell = new TH1F("hfSizeBiggerCell", "Number of fired pixel in bigger cell", 37, 0, 36); - - hfLutPseudoSizeNorm = new TH1F("hfLutPseudoSizeNorm", "Normalized Number of compact pixels in one lut", 13, 0, 12); - hfPseudoSizeNorm = new TH1F("hfPseudoSizeNorm", "Normalized Multiplicity of the cluster identified by the L2T", 13, 0, 12); - hfSizeBiggerCellNorm = new TH1F("hfSizeBiggerCellNorm", "Normalized Number of fired pixel in bigger cell", 37, 0, 36); - - hfLutPseudoSize->SetDirectory(NULL); - hfLutPseudoSizeNorm->SetDirectory(NULL); - hfPseudoSize->SetDirectory(NULL); - hfPseudoSizeNorm->SetDirectory(NULL); - hfSizeBiggerCell->SetDirectory(NULL); - hfSizeBiggerCellNorm->SetDirectory(NULL); - - hfLutPseudoSize->SetXTitle("Number of Pixels"); - hfLutPseudoSizeNorm->SetXTitle("Number of Pixels"); - hfPseudoSize->SetXTitle("Number of Pixels"); - hfPseudoSizeNorm->SetXTitle("Number of Pixels"); - hfSizeBiggerCell->SetXTitle("Number of Pixels"); - hfSizeBiggerCellNorm->SetXTitle("Number of Pixels"); - - hfLutPseudoSize->SetYTitle("Counts"); - hfLutPseudoSizeNorm->SetYTitle("Counts/Total Counts"); - hfPseudoSize->SetYTitle("Counts"); - hfPseudoSizeNorm->SetYTitle("Counts/Total Counts"); - hfSizeBiggerCell->SetYTitle("Counts"); - hfSizeBiggerCellNorm->SetYTitle("Counts/Total Counts"); - - f1 = new TF1("FNorm", "1", -1, 40); + fHistLutPseudoSize = new TH1F("fHistLutPseudoSize", "number of compact pixels in one lut", 13, 0, 12); + fHistPseudoSize = new TH1F("fHistPseudoSize", "Multiplicity of the cluster identified by the L2T", 41, 0, 40); + fHistSizeBiggerCell = new TH1F("fHistSizeBiggerCell", "Number of fired pixel in bigger cell", 37, 0, 36); + + fHistLutPseudoSizeNorm = new TH1F("fHistLutPseudoSizeNorm", "Normalized Number of compact pixels in one lut", 13, 0, 12); + fHistPseudoSizeNorm = new TH1F("fHistPseudoSizeNorm", "Normalized Multiplicity of the cluster identified by the L2T", 41, 0, 40); + fHistSizeBiggerCellNorm = new TH1F("fHistSizeBiggerCellNorm", "Normalized Number of fired pixel in bigger cell", 37, 0, 36); + + fHistLutPseudoSize->SetDirectory(NULL); + fHistLutPseudoSizeNorm->SetDirectory(NULL); + fHistPseudoSize->SetDirectory(NULL); + fHistPseudoSizeNorm->SetDirectory(NULL); + fHistSizeBiggerCell->SetDirectory(NULL); + fHistSizeBiggerCellNorm->SetDirectory(NULL); + + fHistLutPseudoSize->SetXTitle("Number of Pixels"); + fHistLutPseudoSizeNorm->SetXTitle("Number of Pixels"); + fHistPseudoSize->SetXTitle("Number of Pixels"); + fHistPseudoSizeNorm->SetXTitle("Number of Pixels"); + fHistSizeBiggerCell->SetXTitle("Number of Pixels"); + fHistSizeBiggerCellNorm->SetXTitle("Number of Pixels"); + + fHistLutPseudoSize->SetYTitle("Counts"); + fHistLutPseudoSizeNorm->SetYTitle("Counts/Total Counts"); + fHistPseudoSize->SetYTitle("Counts"); + fHistPseudoSizeNorm->SetYTitle("Counts/Total Counts"); + fHistSizeBiggerCell->SetYTitle("Counts"); + fHistSizeBiggerCellNorm->SetYTitle("Counts/Total Counts"); + + fFNorm = new TF1("FNorm", "1", -1, 40); } @@ -131,7 +131,12 @@ MHMcTriggerLvl2::~MHMcTriggerLvl2() { - delete hfLutPseudoSize; - delete hfPseudoSize; - delete hfSizeBiggerCell; + delete fHistLutPseudoSize; + delete fHistPseudoSize; + delete fHistSizeBiggerCell; + delete fHistLutPseudoSizeNorm; + delete fHistPseudoSizeNorm; + delete fHistSizeBiggerCellNorm; + + delete fFNorm; } @@ -145,7 +150,7 @@ const MMcTriggerLvl2 &h = *(MMcTriggerLvl2 *)par; - hfLutPseudoSize->Fill(h.GetLutPseudoSize()); - hfPseudoSize->Fill(h.GetPseudoSize()); - hfSizeBiggerCell->Fill(h.GetSizeBiggerCell()); + fHistLutPseudoSize->Fill(h.GetLutPseudoSize()); + fHistPseudoSize->Fill(h.GetPseudoSize()); + fHistSizeBiggerCell->Fill(h.GetSizeBiggerCell()); return kTRUE; @@ -212,5 +217,5 @@ } - TH1 *hist=NormalizeHist(hfLutPseudoSizeNorm, hfLutPseudoSize); + TH1 *hist=NormalizeHist(fHistLutPseudoSizeNorm, fHistLutPseudoSize); if (!hist) @@ -218,11 +223,11 @@ if (str.Contains("lps",TString::kIgnoreCase)) - return DrawHist(*hfLutPseudoSize, *hist, "CanvasLPS", fColorLps); + return DrawHist(*fHistLutPseudoSize, *hist, "CanvasLPS", fColorLps); if (str.Contains("sbc",TString::kIgnoreCase)) - return DrawHist(*hfSizeBiggerCell, *hist, "CanvasSBC", fColorSbc); + return DrawHist(*fHistSizeBiggerCell, *hist, "CanvasSBC", fColorSbc); if (str.Contains("ps",TString::kIgnoreCase)) - return DrawHist(*hfPseudoSize, *hist, "CanvasPS", fColorPs); + return DrawHist(*fHistPseudoSize, *hist, "CanvasPS", fColorPs); return NULL; @@ -249,11 +254,11 @@ pad1->cd(); - hfLutPseudoSize->Draw(); + fHistLutPseudoSize->Draw(); pad2->cd(); - hfSizeBiggerCell->Draw(); + fHistSizeBiggerCell->Draw(); pad3->cd(); - hfPseudoSize->Draw(); + fHistPseudoSize->Draw(); } @@ -266,17 +271,17 @@ TH1 *MHMcTriggerLvl2::GetHistByName(const TString name) { - if (name.Contains("hfLutPseudoSize", TString::kIgnoreCase)) - return hfLutPseudoSize; - if (name.Contains("hfSizeBiggerCell", TString::kIgnoreCase)) - return hfSizeBiggerCell; - if (name.Contains("hfPseudoSize", TString::kIgnoreCase)) - return hfPseudoSize; - - if (name.Contains("hfLutPseudoSizeNorm", TString::kIgnoreCase)) - return hfLutPseudoSizeNorm; - if (name.Contains("hfSizeBiggerCellNorm", TString::kIgnoreCase)) - return hfSizeBiggerCellNorm; - if (name.Contains("hfPseudoSizeNorm", TString::kIgnoreCase)) - return hfPseudoSizeNorm; + if (name.Contains("fHistLutPseudoSize", TString::kIgnoreCase)) + return fHistLutPseudoSize; + if (name.Contains("fHistSizeBiggerCell", TString::kIgnoreCase)) + return fHistSizeBiggerCell; + if (name.Contains("fHistPseudoSize", TString::kIgnoreCase)) + return fHistPseudoSize; + + if (name.Contains("fHistLutPseudoSizeNorm", TString::kIgnoreCase)) + return fHistLutPseudoSizeNorm; + if (name.Contains("fHistSizeBiggerCellNorm", TString::kIgnoreCase)) + return fHistSizeBiggerCellNorm; + if (name.Contains("fHistPseudoSizeNorm", TString::kIgnoreCase)) + return fHistPseudoSizeNorm; return NULL; @@ -306,5 +311,5 @@ histNorm->Reset("ICE"); histNorm->Add(hist, 1); - histNorm->Divide(f1, (Double_t)(hist->Integral())); + histNorm->Divide(fFNorm, (Double_t)(hist->Integral())); return histNorm; Index: trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.h =================================================================== --- trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.h (revision 1996) +++ trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.h (revision 1997) @@ -17,12 +17,12 @@ private: - TH1F *hfLutPseudoSize; // Histogram of fLutPseudoSize - TH1F *hfLutPseudoSizeNorm; // Histogram of fLutPseudoSize normalized on integral of distribution - TH1F *hfPseudoSize; // Histogram of fPseudoSize - TH1F *hfPseudoSizeNorm; // Histogram of fPseudoSize normalized on integral of distribution - TH1F *hfSizeBiggerCell; // Histogram of fSizeBiggerCell - TH1F *hfSizeBiggerCellNorm; // Histogram of fSizeBiggerCell normalized on integral of distribution + TH1F *fHistLutPseudoSize; // Histogram of fLutPseudoSize + TH1F *fHistLutPseudoSizeNorm; // Histogram of fLutPseudoSize normalized on integral of distribution + TH1F *fHistPseudoSize; // Histogram of fPseudoSize + TH1F *fHistPseudoSizeNorm; // Histogram of fPseudoSize normalized on integral of distribution + TH1F *fHistSizeBiggerCell; // Histogram of fSizeBiggerCell + TH1F *fHistSizeBiggerCellNorm; // Histogram of fSizeBiggerCell normalized on integral of distribution - TF1* f1; // Function used to normalize histograms + TF1* fFNorm; // Function used to normalize histograms static Int_t fColorLps; @@ -38,10 +38,10 @@ TH1 *GetHistByName(const TString name); - TH1F *GetHistfLutPseudoSize() const { return hfLutPseudoSize; } - TH1F *GetHistfLutPseudoSizeNorm() const { return hfLutPseudoSizeNorm; } - TH1F *GetHistfPseudoSize() const { return hfPseudoSize; } - TH1F *GetHistfPseudoSizeNorm() const { return hfPseudoSizeNorm; } - TH1F *GetHistfSizeBiggerCell() const { return hfSizeBiggerCell; } - TH1F *GetHistfSizeBiggerCellNorm() const { return hfSizeBiggerCellNorm; } + TH1F *GetHistfLutPseudoSize() const { return fHistLutPseudoSize; } + TH1F *GetHistfLutPseudoSizeNorm() const { return fHistLutPseudoSizeNorm; } + TH1F *GetHistfPseudoSize() const { return fHistPseudoSize; } + TH1F *GetHistfPseudoSizeNorm() const { return fHistPseudoSizeNorm; } + TH1F *GetHistfSizeBiggerCell() const { return fHistSizeBiggerCell; } + TH1F *GetHistfSizeBiggerCellNorm() const { return fHistSizeBiggerCellNorm; } void Draw(Option_t *opt=NULL);