Skip to content

Commit ee1fa1c

Browse files
aaustaaust
authored
Merge pull request #182 from JeffersonLab/aaust_ECAL_hists
Aaust ecal hists
2 parents c7f218a + b2520a8 commit ee1fa1c

File tree

3 files changed

+42
-2
lines changed

3 files changed

+42
-2
lines changed

‎libraries/DSelector/DHistogramActions.cc‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,13 @@ void DHistogramAction_ParticleID::Create_Hists(int locStepIndex, Particle_t locP
535535
locHistTitle = locParticleROOTName + string(";p (GeV/c); FCAL #beta");
536536
dHistMap_BetaVsP_FCAL[locStepIndex][locPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), dNum2DPBins, dMinP, dMaxP, dNumBetaBins, dMinBeta, dMaxBeta);
537537

538+
locHistName = "DeltaTVsP_ECAL";
539+
locHistTitle = locParticleROOTName + string(";p (GeV/c); ECAL #Delta T (ns)");
540+
dHistMap_DeltaTVsP_ECAL[locStepIndex][locPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), dNum2DPBins, dMinP, dMaxP, dNumDeltaTBins, dMinDeltaT, dMaxDeltaT);
541+
locHistName = "BetaVsP_ECAL";
542+
locHistTitle = locParticleROOTName + string(";p (GeV/c); ECAL #beta");
543+
dHistMap_BetaVsP_ECAL[locStepIndex][locPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), dNum2DPBins, dMinP, dMaxP, dNumBetaBins, dMinBeta, dMaxBeta);
544+
538545
if(ParticleCharge(locPID) != 0)
539546
{
540547

@@ -581,6 +588,13 @@ void DHistogramAction_ParticleID::Create_Hists(int locStepIndex, Particle_t locP
581588
locHistTitle = locParticleROOTName + string(";#theta (degrees); FCAL E/p");
582589
dHistMap_EoverPVsTheta_FCAL[locStepIndex][locPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), 120, 0., 12., dNumEoverPBins, dMinEoverP, dMaxEoverP);
583590

591+
locHistName = "EoverPVsP_ECAL";
592+
locHistTitle = locParticleROOTName + string(";p (GeV/c); ECAL E/p");
593+
dHistMap_EoverPVsP_ECAL[locStepIndex][locPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), dNum2DPBins, dMinP, dMaxP, dNumEoverPBins, dMinEoverP, dMaxEoverP);
594+
locHistName = "EoverPVsTheta_ECAL";
595+
locHistTitle = locParticleROOTName + string(";#theta (degrees); ECAL E/p");
596+
dHistMap_EoverPVsTheta_ECAL[locStepIndex][locPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), 120, 0., 12., dNumEoverPBins, dMinEoverP, dMaxEoverP);
597+
584598
// PreshowerFraction BCAL vs p, theta
585599
locHistName = "PreshowerFractionVsP_BCAL";
586600
locHistTitle = locParticleROOTName + string(";p (GeV/c); BCAL Preshower Energy / Shower Energy");
@@ -635,6 +649,10 @@ void DHistogramAction_ParticleID::Create_BackgroundHists(int locStepIndex, Parti
635649
locHistTitle = locParticleROOTName + string(";p (GeV/c); FCAL #Delta T (ns)");
636650
dBackgroundHistMap_DeltaTVsP_FCAL[locStepIndex][locFinalStatePID][locBackgroundPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), dNum2DPBins, dMinP, dMaxP, dNumDeltaTBins, dMinDeltaT, dMaxDeltaT);
637651

652+
locHistName = "DeltaTVsP_ECAL";
653+
locHistTitle = locParticleROOTName + string(";p (GeV/c); ECAL #Delta T (ns)");
654+
dBackgroundHistMap_DeltaTVsP_ECAL[locStepIndex][locFinalStatePID][locBackgroundPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), dNum2DPBins, dMinP, dMaxP, dNumDeltaTBins, dMinDeltaT, dMaxDeltaT);
655+
638656
locHistName = "DeltaTVsP_TOF";
639657
locHistTitle = locParticleROOTName + string(";p (GeV/c); TOF #Delta T (ns)");
640658
dBackgroundHistMap_DeltaTVsP_TOF[locStepIndex][locFinalStatePID][locBackgroundPID] = new TH2I(locHistName.c_str(), locHistTitle.c_str(), dNum2DPBins, dMinP, dMaxP, dNumDeltaTBins, dMinDeltaT, dMaxDeltaT);
@@ -747,6 +765,10 @@ void DHistogramAction_ParticleID::Fill_Hists(const DKinematicData* locKinematicD
747765
dHistMap_BetaVsP_FCAL[locStepIndex][locPID]->Fill(locP, locBeta_Timing);
748766
dHistMap_DeltaTVsP_FCAL[locStepIndex][locPID]->Fill(locP, locDeltaT);
749767
}
768+
else if(locChargedTrackHypothesis->Get_Detector_System_Timing() == SYS_ECAL) {
769+
dHistMap_BetaVsP_ECAL[locStepIndex][locPID]->Fill(locP, locBeta_Timing);
770+
dHistMap_DeltaTVsP_ECAL[locStepIndex][locPID]->Fill(locP, locDeltaT);
771+
}
750772

751773
// dE/dx vs p
752774
if(locChargedTrackHypothesis->Get_dEdx_CDC() > 0.)
@@ -778,6 +800,11 @@ void DHistogramAction_ParticleID::Fill_Hists(const DKinematicData* locKinematicD
778800
dHistMap_EoverPVsP_FCAL[locStepIndex][locPID]->Fill(locP, locEoverP);
779801
dHistMap_EoverPVsTheta_FCAL[locStepIndex][locPID]->Fill(locTheta, locEoverP);
780802
}
803+
if(locChargedTrackHypothesis->Get_Energy_ECAL() > 0.) {
804+
double locEoverP = locChargedTrackHypothesis->Get_Energy_ECAL()/locP;
805+
dHistMap_EoverPVsP_ECAL[locStepIndex][locPID]->Fill(locP, locEoverP);
806+
dHistMap_EoverPVsTheta_ECAL[locStepIndex][locPID]->Fill(locTheta, locEoverP);
807+
}
781808

782809
// DIRC
783810
int locNumPhotons_DIRC = locChargedTrackHypothesis->Get_Track_NumPhotons_DIRC();
@@ -818,6 +845,10 @@ void DHistogramAction_ParticleID::Fill_Hists(const DKinematicData* locKinematicD
818845
dHistMap_BetaVsP_FCAL[locStepIndex][locPID]->Fill(locP, locBeta_Timing);
819846
dHistMap_DeltaTVsP_FCAL[locStepIndex][locPID]->Fill(locP, locDeltaT);
820847
}
848+
else if(locNeutralParticleHypothesis->Get_Energy_ECAL() > 0.) {
849+
dHistMap_BetaVsP_ECAL[locStepIndex][locPID]->Fill(locP, locBeta_Timing);
850+
dHistMap_DeltaTVsP_ECAL[locStepIndex][locPID]->Fill(locP, locDeltaT);
851+
}
821852
}
822853
}
823854
}
@@ -839,6 +870,8 @@ void DHistogramAction_ParticleID::Fill_BackgroundHists(size_t locStepIndex, Part
839870
dBackgroundHistMap_DeltaTVsP_TOF[locStepIndex][locFinalStatePID][locPID]->Fill(locP, locDeltaT);
840871
else if(dChargedHypoWrapper->Get_Detector_System_Timing() == SYS_FCAL)
841872
dBackgroundHistMap_DeltaTVsP_FCAL[locStepIndex][locFinalStatePID][locPID]->Fill(locP, locDeltaT);
873+
else if(dChargedHypoWrapper->Get_Detector_System_Timing() == SYS_ECAL)
874+
dBackgroundHistMap_DeltaTVsP_ECAL[locStepIndex][locFinalStatePID][locPID]->Fill(locP, locDeltaT);
842875
}
843876

844877
void DHistogramAction_PIDFOM::Initialize(void)

‎libraries/DSelector/DHistogramActions.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,11 @@ class DHistogramAction_ParticleID : public DAnalysisAction
208208
map<size_t, map<Particle_t, TH2I*> > dHistMap_BetaVsP_BCAL;
209209
map<size_t, map<Particle_t, TH2I*> > dHistMap_BetaVsP_TOF;
210210
map<size_t, map<Particle_t, TH2I*> > dHistMap_BetaVsP_FCAL;
211+
map<size_t, map<Particle_t, TH2I*> > dHistMap_BetaVsP_ECAL;
211212
map<size_t, map<Particle_t, TH2I*> > dHistMap_DeltaTVsP_BCAL;
212213
map<size_t, map<Particle_t, TH2I*> > dHistMap_DeltaTVsP_TOF;
213214
map<size_t, map<Particle_t, TH2I*> > dHistMap_DeltaTVsP_FCAL;
215+
map<size_t, map<Particle_t, TH2I*> > dHistMap_DeltaTVsP_ECAL;
214216

215217
map<size_t, map<Particle_t, TH2I*> > dHistMap_EoverPVsP_BCAL;
216218
map<size_t, map<Particle_t, TH2I*> > dHistMap_EoverPVsTheta_BCAL;
@@ -220,6 +222,9 @@ class DHistogramAction_ParticleID : public DAnalysisAction
220222

221223
map<size_t, map<Particle_t, TH2I*> > dHistMap_EoverPVsP_FCAL;
222224
map<size_t, map<Particle_t, TH2I*> > dHistMap_EoverPVsTheta_FCAL;
225+
226+
map<size_t, map<Particle_t, TH2I*> > dHistMap_EoverPVsP_ECAL;
227+
map<size_t, map<Particle_t, TH2I*> > dHistMap_EoverPVsTheta_ECAL;
223228

224229
map<size_t, map<Particle_t, TH2I*> > dHistMap_ShowerZVsParticleZ;
225230
map<size_t, map<Particle_t, TH2I*> > dHistMap_ShowerTVsParticleT;
@@ -233,6 +238,7 @@ class DHistogramAction_ParticleID : public DAnalysisAction
233238
map<size_t, map<Particle_t, map<Particle_t, TH2I*> > > dBackgroundHistMap_DeltaTVsP_BCAL;
234239
map<size_t, map<Particle_t, map<Particle_t, TH2I*> > > dBackgroundHistMap_DeltaTVsP_TOF;
235240
map<size_t, map<Particle_t, map<Particle_t, TH2I*> > > dBackgroundHistMap_DeltaTVsP_FCAL;
241+
map<size_t, map<Particle_t, map<Particle_t, TH2I*> > > dBackgroundHistMap_DeltaTVsP_ECAL;
236242

237243
map<size_t, map<Particle_t, set<Int_t> > > dPreviouslyHistogrammed; //step index, PID, particle indices
238244
map<size_t, map<Particle_t, map<Particle_t, set<Int_t> > > > dPreviouslyHistogrammed_Background; //step index, PID, background PID, particle indices

‎libraries/DSelector/DSelector.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,9 @@ inline DSelector::DSelector(TTree* locTree) :
210210
dThrownBeam(NULL), dThrownWrapper(NULL), dChargedHypoWrapper(NULL), dNeutralHypoWrapper(NULL),
211211
dBeamWrapper(NULL), dComboWrapper(NULL), dAnalysisActions(vector<DAnalysisAction*>()),
212212
dFile(NULL), dOutputFlatTreeFile(NULL), dProofFile(NULL), dOutputFlatTreeProofFile(NULL),
213-
dTreeNumber(0), dRunNumber(NULL), dEventNumber(NULL), dL1TriggerBits(NULL), dMCWeight(NULL), dGeneratedEnergy(NULL), dIsThrownTopology(NULL), dX4_Production(NULL),
214-
dL1BCALEnergy(NULL), dL1FCALEnergy(NULL), dL1ECALEnergy(NULL), dL1FCAL2Energy(NULL),
213+
dTreeNumber(0), dRunNumber(NULL), dEventNumber(NULL), dL1TriggerBits(NULL),
214+
dL1BCALEnergy(NULL), dL1FCALEnergy(NULL), dL1ECALEnergy(NULL), dL1FCAL2Energy(NULL),
215+
dMCWeight(NULL), dGeneratedEnergy(NULL), dIsThrownTopology(NULL), dX4_Production(NULL),
215216
dNumBeam(NULL), dNumChargedHypos(NULL), dNumNeutralHypos(NULL), dNumCombos(NULL), dNumThrown(NULL),
216217
dNumPIDThrown_FinalState(NULL), dPIDThrown_Decaying(NULL) {}
217218

0 commit comments

Comments
 (0)