diff --git a/Modules/HMPID/include/HMPID/HmpidTaskClusters.h b/Modules/HMPID/include/HMPID/HmpidTaskClusters.h index 04bf752524..44948001da 100644 --- a/Modules/HMPID/include/HMPID/HmpidTaskClusters.h +++ b/Modules/HMPID/include/HMPID/HmpidTaskClusters.h @@ -55,6 +55,8 @@ class HmpidTaskClusters : public TaskInterface TH1F* hClusMultEv; TH1F* hHMPIDchargeClus[7]; TH1F* hHMPIDchargeMipClus[7]; + TH1F* hHMPIDclusX[7]; + TH1F* hHMPIDclusY[7]; TH2F* hHMPIDpositionClus[7]; std::vector mPublishedObjects; diff --git a/Modules/HMPID/include/HMPID/HmpidTaskMatches.h b/Modules/HMPID/include/HMPID/HmpidTaskMatches.h index 539df222a6..bbb51c06c3 100644 --- a/Modules/HMPID/include/HMPID/HmpidTaskMatches.h +++ b/Modules/HMPID/include/HMPID/HmpidTaskMatches.h @@ -61,6 +61,10 @@ class HmpidTaskMatches : public TaskInterface TH1F* mMatchInfoResidualsYTrackMIP[7]; TH1F* mMatchInfoChargeClusterMIP[7]; TH1F* mMatchInfoChargeClusterPhotons[7]; + TH1F* mMatchInfoXMip[7]; + TH1F* mMatchInfoYMip[7]; + TH1F* mMatchInfoXTrack[7]; + TH1F* mMatchInfoYTrack[7]; TH2F* mMatchInfoClusterMIPMap[7]; TH2F* mMatchInfoThetaCherenkovVsMom[7]; diff --git a/Modules/HMPID/src/HmpidTaskClusters.cxx b/Modules/HMPID/src/HmpidTaskClusters.cxx index 4c85968f2e..04a83dc554 100644 --- a/Modules/HMPID/src/HmpidTaskClusters.cxx +++ b/Modules/HMPID/src/HmpidTaskClusters.cxx @@ -44,6 +44,8 @@ HmpidTaskClusters::~HmpidTaskClusters() for (Int_t iCh = 0; iCh < 7; iCh++) { delete hHMPIDchargeClus[iCh]; delete hHMPIDchargeMipClus[iCh]; + delete hHMPIDclusX[7]; + delete hHMPIDclusY[7]; delete hHMPIDpositionClus[iCh]; } } @@ -64,6 +66,8 @@ void HmpidTaskClusters::initialize(o2::framework::InitContext& /*ctx*/) getObjectsManager()->startPublishing(hHMPIDchargeClus[iCh]); getObjectsManager()->startPublishing(hHMPIDchargeMipClus[iCh]); getObjectsManager()->startPublishing(hHMPIDpositionClus[iCh]); + getObjectsManager()->startPublishing(hHMPIDclusX[iCh]); + getObjectsManager()->startPublishing(hHMPIDclusY[iCh]); getObjectsManager()->setDefaultDrawOptions(hHMPIDpositionClus[iCh], "colz"); getObjectsManager()->setDisplayHint(hHMPIDpositionClus[iCh], "colz"); } @@ -75,13 +79,11 @@ void HmpidTaskClusters::initialize(o2::framework::InitContext& /*ctx*/) void HmpidTaskClusters::startOfActivity(const Activity& /*activity*/) { - ILOG(Debug, Devel) << "startOfActivity" << ENDM; reset(); } void HmpidTaskClusters::startOfCycle() { - ILOG(Debug, Devel) << "startOfCycle" << ENDM; } void HmpidTaskClusters::monitorData(o2::framework::ProcessingContext& ctx) @@ -113,6 +115,8 @@ void HmpidTaskClusters::monitorData(o2::framework::ProcessingContext& ctx) if (clusters[j].size() >= 3 && clusters[j].size() <= 7) { hHMPIDchargeMipClus[chamber]->Fill(clusters[j].q()); } + hHMPIDclusX[chamber]->Fill(clusters[j].x()); + hHMPIDclusY[chamber]->Fill(clusters[j].y()); hHMPIDpositionClus[chamber]->Fill(clusters[j].x(), clusters[j].y()); } } // cluster loop @@ -124,18 +128,15 @@ void HmpidTaskClusters::monitorData(o2::framework::ProcessingContext& ctx) void HmpidTaskClusters::endOfCycle() { - - ILOG(Debug, Devel) << "endOfCycle" << ENDM; } void HmpidTaskClusters::endOfActivity(const Activity& /*activity*/) { - ILOG(Debug, Devel) << "endOfActivity" << ENDM; } void HmpidTaskClusters::BookHistograms() { - hClusMultEv = new TH1F("ClusMultEve", "HMPID Cluster multiplicity per event", 500, 0, 500); + hClusMultEv = new TH1F("ClusMultEve", "HMPID Cluster multiplicity per event", 1000, 0, 1000); ThClusMult = new TProfile("ClusMult", "HMPID Cluster multiplicity per chamber;Chamber Id;# of clusters/event", 7, 0., 7.); ThClusMult->Sumw2(); @@ -147,8 +148,10 @@ void HmpidTaskClusters::BookHistograms() ThClusMult->SetStats(0); for (Int_t iCh = 0; iCh < 7; iCh++) { - hHMPIDchargeClus[iCh] = new TH1F(Form("CluQ%i", iCh), Form("Cluster Charge in HMPID Chamber %i ; Entries/1 ADC; Q (ADC)", iCh), 2000, 0, 2000); - hHMPIDchargeMipClus[iCh] = new TH1F(Form("MipCluQ%i", iCh), Form("MIP Cluster Charge in HMPID Chamber %i;Entries/1 ADC;Q (ADC)", iCh), 2000, 200, 2200); + hHMPIDchargeClus[iCh] = new TH1F(Form("CluQ%i", iCh), Form("Cluster Charge in HMPID Chamber %i; Q (ADC); Entries/1 ADC", iCh), 2000, 0, 2000); + hHMPIDchargeMipClus[iCh] = new TH1F(Form("MipCluQ%i", iCh), Form("MIP Cluster Charge in HMPID Chamber %i; Q (ADC); Entries/1 ADC", iCh), 2000, 200, 2200); + hHMPIDclusX[iCh] = new TH1F(Form("ClusX%i", iCh), Form("X Cluster in HMPID Chamber %i; X (cm); Entries/1 cm", iCh), 133, 0, 133); + hHMPIDclusY[iCh] = new TH1F(Form("ClusY%i", iCh), Form("Y Cluster in HMPID Chamber %i; Y (cm); Entries/1 cm", iCh), 125, 0, 125); hHMPIDpositionClus[iCh] = new TH2F(Form("ClusterPoistion%i", iCh), Form("Cluster Position in HMPID Chamber %i; X (cm); Y (cm)", iCh), 133, 0, 133, 125, 0, 125); // cmxcm hHMPIDpositionClus[iCh]->SetStats(0); } @@ -165,6 +168,8 @@ void HmpidTaskClusters::reset() for (Int_t iCh = 0; iCh < 7; iCh++) { hHMPIDchargeClus[iCh]->Reset(); hHMPIDchargeMipClus[iCh]->Reset(); + hHMPIDclusX[iCh]->Reset(); + hHMPIDclusY[iCh]->Reset(); hHMPIDpositionClus[iCh]->Reset(); } } diff --git a/Modules/HMPID/src/HmpidTaskMatches.cxx b/Modules/HMPID/src/HmpidTaskMatches.cxx index 116c212024..86f117e869 100644 --- a/Modules/HMPID/src/HmpidTaskMatches.cxx +++ b/Modules/HMPID/src/HmpidTaskMatches.cxx @@ -45,6 +45,10 @@ HmpidTaskMatches::~HmpidTaskMatches() delete mMatchInfoResidualsYTrackMIP[iCh]; delete mMatchInfoChargeClusterMIP[iCh]; delete mMatchInfoChargeClusterPhotons[iCh]; + delete mMatchInfoXMip[iCh]; + delete mMatchInfoYMip[iCh]; + delete mMatchInfoXTrack[iCh]; + delete mMatchInfoYTrack[iCh]; delete mMatchInfoClusterMIPMap[iCh]; delete mMatchInfoThetaCherenkovVsMom[iCh]; } @@ -66,6 +70,10 @@ void HmpidTaskMatches::initialize(o2::framework::InitContext& /*ctx*/) getObjectsManager()->startPublishing(mMatchInfoClusterMIPMap[iCh]); getObjectsManager()->setDefaultDrawOptions(mMatchInfoClusterMIPMap[iCh], "colz"); getObjectsManager()->setDisplayHint(mMatchInfoClusterMIPMap[iCh], "colz"); + getObjectsManager()->startPublishing(mMatchInfoXMip[iCh]); + getObjectsManager()->startPublishing(mMatchInfoYMip[iCh]); + getObjectsManager()->startPublishing(mMatchInfoXTrack[iCh]); + getObjectsManager()->startPublishing(mMatchInfoXTrack[iCh]); getObjectsManager()->startPublishing(mMatchInfoThetaCherenkovVsMom[iCh]); } } @@ -112,6 +120,10 @@ void HmpidTaskMatches::monitorData(o2::framework::ProcessingContext& ctx) if (matchHMP.getMipClusSize() < 20 && matchHMP.getMipClusSize() > 1) { mMatchInfoChargeClusterMIP[ch]->Fill(q); } + mMatchInfoXMip[ch]->Fill(xMip); + mMatchInfoYMip[ch]->Fill(yMip); + mMatchInfoXTrack[ch]->Fill(xTrk); + mMatchInfoYTrack[ch]->Fill(yTrk); mMatchInfoClusterMIPMap[ch]->Fill(xMip, yMip); mMatchInfoThetaCherenkovVsMom[ch]->Fill(TMath::Abs(matchHMP.getHmpMom()), matchHMP.getHMPsignal()); } // match info loop @@ -129,13 +141,17 @@ void HmpidTaskMatches::BookHistograms() { for (int iCh = 0; iCh < 7; iCh++) { - mMatchInfoResidualsXTrackMIP[iCh] = new TH1F(Form("X Residuals chamber %i", iCh), Form("X Residuals chamber %i; X residuals (cm); Counts/1 cm", iCh), 100, -50., 50.); - mMatchInfoResidualsYTrackMIP[iCh] = new TH1F(Form("Y Residuals chamber %i", iCh), Form("Y Residuals chamber %i; Y residuals (cm); Counts/1 cm", iCh), 100, -50., 50.); - mMatchInfoChargeClusterMIP[iCh] = new TH1F(Form("MIP Cluster Charge chamber %i", iCh), Form("MIP Cluster Charge chamber %i; ADC charge; Counts/1 ADC", iCh), 2000, 200., 2200.); - mMatchInfoChargeClusterPhotons[iCh] = new TH1F(Form("Photo-electron Cluster Charge chamber %i", iCh), Form("Photo-electron cluster charge chmaber %i; ADC charge; Counts/1 ADC", iCh), 180, 20., 200.); - mMatchInfoClusterMIPMap[iCh] = new TH2F(Form("MIP Cluster map chamber %i", iCh), Form("MIP Cluster map chamber %i; X (cm); Y (cm)", iCh), 133, 0, 133, 125, 0, 125); + mMatchInfoResidualsXTrackMIP[iCh] = new TH1F(Form("XResCham%i", iCh), Form("X Residuals chamber %i; X residuals (cm); Entries/1 cm", iCh), 100, -50., 50.); + mMatchInfoResidualsYTrackMIP[iCh] = new TH1F(Form("YRescham%i", iCh), Form("Y Residuals chamber %i; Y residuals (cm); Entries/1 cm", iCh), 100, -50., 50.); + mMatchInfoChargeClusterMIP[iCh] = new TH1F(Form("MipClusQch%i", iCh), Form("MIP Cluster Charge chamber %i; ADC charge; Entries/1 ADC", iCh), 2000, 200., 2200.); + mMatchInfoChargeClusterPhotons[iCh] = new TH1F(Form("PhelQch%i", iCh), Form("Photo-electron cluster charge chmaber %i; ADC charge; Counts/1 ADC", iCh), 180, 20., 200.); + mMatchInfoClusterMIPMap[iCh] = new TH2F(Form("MipClusMap%i", iCh), Form("MIP Cluster map chamber %i; X (cm); Y (cm)", iCh), 133, 0, 133, 125, 0, 125); mMatchInfoClusterMIPMap[iCh]->SetStats(0); - mMatchInfoThetaCherenkovVsMom[iCh] = new TH2F(Form("ThetaCherenkov Vs Mom chamber %i", iCh), Form("ThetaCherenkov Vs Mom chamber %i; #it{p} (GeV/#it{c}); #theta_{Ckov} (rad);", iCh), 100, 0., 10., 1000, 0., 1.); + mMatchInfoXMip[iCh] = new TH1F(Form("MipX%i", iCh), Form("X MIP in HMPID Chamber %i; X (cm); Entries/1 cm", iCh), 133, 0, 133); + mMatchInfoYMip[iCh] = new TH1F(Form("MipY%i", iCh), Form("Y MIP in HMPID Chamber %i; Y (cm); Entries/1 cm", iCh), 125, 0, 125); + mMatchInfoXTrack[iCh] = new TH1F(Form("TrackX%i", iCh), Form("X Track in HMPID Chamber %i; X (cm); Entries/1 cm", iCh), 133, 0, 133); + mMatchInfoYTrack[iCh] = new TH1F(Form("TrackY%i", iCh), Form("Y Track in HMPID Chamber %i; Y (cm); Entries/1 cm", iCh), 125, 0, 125); + mMatchInfoThetaCherenkovVsMom[iCh] = new TH2F(Form("ThetavsMom%i", iCh), Form("ThetaCherenkov Vs Mom chamber %i; #it{p} (GeV/#it{c}); #theta_{Ckov} (rad);", iCh), 100, 0., 10., 1000, 0., 1.); } // } @@ -152,6 +168,10 @@ void HmpidTaskMatches::reset() mMatchInfoChargeClusterMIP[iCh]->Reset(); mMatchInfoChargeClusterPhotons[iCh]->Reset(); mMatchInfoClusterMIPMap[iCh]->Reset(); + mMatchInfoXMip[iCh]->Reset(); + mMatchInfoYMip[iCh]->Reset(); + mMatchInfoXTrack[iCh]->Reset(); + mMatchInfoYTrack[iCh]->Reset(); mMatchInfoThetaCherenkovVsMom[iCh]->Reset(); } }