Merge pull request #181 from JeffersonLab/ecal_tree

add ECAL showers

Author: jrstevenjlab

libraries/DSelector/DChargedTrackHypothesis.h

@@ -86,6 +86,8 @@ class DChargedTrackHypothesis : public DKinematicData
 		Float_t Get_SumU_FCAL(void) const;
 		Float_t Get_SumV_FCAL(void) const;
 
+	        Float_t Get_Energy_ECAL(void) const;
+
 		//SHOWER MATCHING
 		Float_t Get_TrackBCAL_DeltaPhi(void) const; //999.0 if not matched //units are radians
 		Float_t Get_TrackBCAL_DeltaZ(void) const; //999.0 if not matched
@@ -172,6 +174,8 @@ class DChargedTrackHypothesis : public DKinematicData
 		TBranch* dBranch_E9E25_FCAL;
 		TBranch* dBranch_SumU_FCAL;
 		TBranch* dBranch_SumV_FCAL;
+
+	        TBranch* dBranch_Energy_ECAL;
 
 		//SHOWER MATCHING
 		TBranch* dBranch_TrackBCAL_DeltaPhi;
@@ -353,6 +357,9 @@ inline void DChargedTrackHypothesis::Setup_Branches(void)
 	locBranchName = "ChargedHypo__SumV_FCAL";
 	dBranch_SumV_FCAL = dTreeInterface->Get_Branch(locBranchName);
 
+	locBranchName = "ChargedHypo__Energy_ECAL";
+	dBranch_Energy_ECAL = dTreeInterface->Get_Branch(locBranchName);
+	
 	//SHOWER MATCHING:
 	locBranchName = "ChargedHypo__TrackBCAL_DeltaPhi";
 	dBranch_TrackBCAL_DeltaPhi = dTreeInterface->Get_Branch(locBranchName);
@@ -693,6 +700,10 @@ inline Float_t DChargedTrackHypothesis::Get_SumV_FCAL(void) const
 		return ((Float_t*)dBranch_SumV_FCAL->GetAddress())[dMeasuredArrayIndex];
 }
 
+inline Float_t DChargedTrackHypothesis::Get_Energy_ECAL(void) const
+{
+	return ((Float_t*)dBranch_Energy_ECAL->GetAddress())[dMeasuredArrayIndex];
+}
 
 //SHOWER MATCHING:
 inline Float_t DChargedTrackHypothesis::Get_TrackBCAL_DeltaPhi(void) const

libraries/DSelector/DNeutralParticleHypothesis.h

@@ -75,6 +75,9 @@ class DNeutralParticleHypothesis : public DKinematicData
 		Float_t Get_SumV_FCAL(void) const;
 		Float_t Get_NumBlocks_FCAL(void) const;
 		Float_t Get_TrackFCAL_DeltaT(void) const;
+	
+	Float_t Get_Energy_ECAL(void) const;
+	Float_t Get_NumBlocks_ECAL(void) const;
 
 		//TRACK MATCHING
 		Float_t Get_TrackBCAL_DeltaPhi(void) const; //999.0 if not matched //units are radians
@@ -136,6 +139,9 @@ class DNeutralParticleHypothesis : public DKinematicData
 		TBranch* dBranch_NumBlocks_FCAL;
 		TBranch* dBranch_TrackFCAL_DeltaT;
 
+	TBranch* dBranch_Energy_ECAL;	
+       	TBranch* dBranch_NumBlocks_ECAL;
+
 		//TRACK MATCHING
 		TBranch* dBranch_TrackBCAL_DeltaPhi;
 		TBranch* dBranch_TrackBCAL_DeltaZ;
@@ -261,7 +267,11 @@ inline void DNeutralParticleHypothesis::Setup_Branches(void)
 	locBranchName = "NeutralHypo__TrackFCAL_DeltaT";
 	dBranch_TrackFCAL_DeltaT = dTreeInterface->Get_Branch(locBranchName);
 
+	locBranchName = "NeutralHypo__Energy_ECAL";
+	dBranch_Energy_ECAL = dTreeInterface->Get_Branch(locBranchName);
 
+	locBranchName = "NeutralHypo__NumBlocks_ECAL";
+	dBranch_NumBlocks_ECAL = dTreeInterface->Get_Branch(locBranchName);
 
 	//TRACK MATCHING:
 	locBranchName = "NeutralHypo__TrackBCAL_DeltaPhi";
@@ -509,6 +519,19 @@ inline Float_t DNeutralParticleHypothesis::Get_TrackFCAL_DeltaT(void) const
 		return ((Float_t*)dBranch_TrackFCAL_DeltaT->GetAddress())[dMeasuredArrayIndex];
 }
 
+inline Float_t DNeutralParticleHypothesis::Get_Energy_ECAL(void) const
+{
+	return ((Float_t*)dBranch_Energy_ECAL->GetAddress())[dMeasuredArrayIndex];
+}
+
+inline Float_t DNeutralParticleHypothesis::Get_NumBlocks_ECAL(void) const
+{
+	if(dBranch_NumBlocks_ECAL == NULL)
+		return -1.;
+	else
+		return ((Float_t*)dBranch_NumBlocks_ECAL->GetAddress())[dMeasuredArrayIndex];
+}
+
 inline TLorentzVector DNeutralParticleHypothesis::Get_X4_Shower(void) const
 {
 	return *((TLorentzVector*)(*dX4_Shower)->At(dMeasuredArrayIndex));

libraries/DSelector/DSelector.cc

@@ -97,6 +97,10 @@ void DSelector::Setup_Branches(void)
 	dL1BCALEnergy = (locL1BCALEnergyBranch != NULL) ? (Double_t*)locL1BCALEnergyBranch->GetAddress() : NULL;
 	TBranch* locL1FCALEnergyBranch = dTreeInterface->Get_Branch("L1FCALEnergy");
 	dL1FCALEnergy = (locL1FCALEnergyBranch != NULL) ? (Double_t*)locL1FCALEnergyBranch->GetAddress() : NULL;
+	TBranch* locL1ECALEnergyBranch = dTreeInterface->Get_Branch("L1ECALEnergy");
+	dL1ECALEnergy = (locL1ECALEnergyBranch != NULL) ? (Double_t*)locL1ECALEnergyBranch->GetAddress() : NULL;
+	TBranch* locL1FCAL2EnergyBranch = dTreeInterface->Get_Branch("L1FCAL2Energy");
+	dL1FCAL2Energy = (locL1FCAL2EnergyBranch != NULL) ? (Double_t*)locL1FCAL2EnergyBranch->GetAddress() : NULL;
 
 	// MC
 	if(dIsMCFlag)

libraries/DSelector/DSelector.h

@@ -92,6 +92,8 @@ class DSelector : public TSelector
 		UInt_t Get_L1TriggerBits(void) const;
 		Double_t Get_L1BCALEnergy(void) const;
 		Double_t Get_L1FCALEnergy(void) const;
+	        Double_t Get_L1ECALEnergy(void) const;
+		Double_t Get_L1FCAL2Energy(void) const;
 		Bool_t Get_IsThrownTopology(void) const;
 		Float_t Get_MCWeight(void) const;
 		Float_t Get_GeneratedEnergy(void) const;
@@ -155,6 +157,8 @@ class DSelector : public TSelector
 		UInt_t* dL1TriggerBits;
 		Double_t* dL1BCALEnergy;
 		Double_t* dL1FCALEnergy;
+	        Double_t* dL1ECALEnergy;
+		Double_t* dL1FCAL2Energy;
 		Float_t* dMCWeight; //only present if simulated data
 		Float_t* dGeneratedEnergy; //only present if simulated data
 		Bool_t* dIsThrownTopology; //only present if simulated data
@@ -207,6 +211,7 @@ inline DSelector::DSelector(TTree* locTree) :
 		dBeamWrapper(NULL), dComboWrapper(NULL), dAnalysisActions(vector<DAnalysisAction*>()),
 		dFile(NULL), dOutputFlatTreeFile(NULL), dProofFile(NULL), dOutputFlatTreeProofFile(NULL),
 		dTreeNumber(0), dRunNumber(NULL), dEventNumber(NULL), dL1TriggerBits(NULL), dMCWeight(NULL), dGeneratedEnergy(NULL), dIsThrownTopology(NULL), dX4_Production(NULL),
+		dL1BCALEnergy(NULL), dL1FCALEnergy(NULL), dL1ECALEnergy(NULL), dL1FCAL2Energy(NULL), 
 		dNumBeam(NULL), dNumChargedHypos(NULL), dNumNeutralHypos(NULL), dNumCombos(NULL), dNumThrown(NULL),
 		dNumPIDThrown_FinalState(NULL), dPIDThrown_Decaying(NULL) {}
 
@@ -238,6 +243,16 @@ inline Double_t DSelector::Get_L1FCALEnergy(void) const
 	return *dL1FCALEnergy;
 }
 
+inline Double_t DSelector::Get_L1ECALEnergy(void) const
+{
+	return *dL1ECALEnergy;
+}
+
+inline Double_t DSelector::Get_L1FCAL2Energy(void) const
+{
+	return *dL1FCAL2Energy;
+}
+
 inline Bool_t DSelector::Get_IsThrownTopology(void) const
 {
 	return ((dIsThrownTopology != NULL) ? *dIsThrownTopology : false);