Skip to content

Fix for crashes when running over thrown trees #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaust merged 1 commit into from
Aug 16, 2024
Merged

Fix for crashes when running over thrown trees #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions libraries/DSelector/DSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ void DSelector::Init(TTree *locTree)

void DSelector::Setup_Branches(void)
{
bool locIsMCFlag = (dTreeInterface->Get_Branch("MCWeight") != NULL);
bool locIsMCGenOnlyFlag = (dTreeInterface->Get_Branch("NumCombos") == NULL);

dIsMCFlag = (dTreeInterface->Get_Branch("MCWeight") != NULL);
dIsMCGenOnlyFlag = (dTreeInterface->Get_Branch("NumCombos") == NULL);
// EVENT DATA
dRunNumber = (UInt_t*)dTreeInterface->Get_Branch("RunNumber")->GetAddress();
dEventNumber = (ULong64_t*)dTreeInterface->Get_Branch("EventNumber")->GetAddress();
Expand All @@ -99,20 +99,20 @@ void DSelector::Setup_Branches(void)
dL1FCALEnergy = (locL1FCALEnergyBranch != NULL) ? (Double_t*)locL1FCALEnergyBranch->GetAddress() : NULL;

// MC
if(locIsMCFlag)
if(dIsMCFlag)
{
dMCWeight = (Float_t*)dTreeInterface->Get_Branch("MCWeight")->GetAddress();
TBranch* locGenEnergyBranch = dTreeInterface->Get_Branch("GeneratedEnergy");
dGeneratedEnergy = (locGenEnergyBranch != NULL) ? (Float_t*)locGenEnergyBranch->GetAddress() : NULL;
dNumThrown = (UInt_t*)dTreeInterface->Get_Branch("NumThrown")->GetAddress();
dNumPIDThrown_FinalState = (ULong64_t*)dTreeInterface->Get_Branch("NumPIDThrown_FinalState")->GetAddress();
dPIDThrown_Decaying = (ULong64_t*)dTreeInterface->Get_Branch("PIDThrown_Decaying")->GetAddress();
if(!locIsMCGenOnlyFlag)
if(!dIsMCGenOnlyFlag)
dIsThrownTopology = (Bool_t*)dTreeInterface->Get_Branch("IsThrownTopology")->GetAddress();
}

// DATA
if(!locIsMCGenOnlyFlag)
if(!dIsMCGenOnlyFlag)
{
dNumBeam = (UInt_t*)dTreeInterface->Get_Branch("NumBeam")->GetAddress();
dNumChargedHypos = (UInt_t*)dTreeInterface->Get_Branch("NumChargedHypos")->GetAddress();
Expand Down Expand Up @@ -247,7 +247,7 @@ Bool_t DSelector::Process(Long64_t locEntry)

// zero out loop indicies if there are no trigger bits set, so that we skip such events
// leave this as an togglable option for trigger studies
if( (dL1TriggerBits==0) && dSkipNoTriggerEvents) {
if( (dL1TriggerBits==0) && dSkipNoTriggerEvents && !dIsMCGenOnlyFlag ) {
*dNumBeam = 0;
*dNumChargedHypos = 0;
*dNumNeutralHypos = 0;
Expand Down
5 changes: 4 additions & 1 deletion libraries/DSelector/DSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ class DSelector : public TSelector
bool dSaveDefaultFlatBranches; // True by default
bool dSaveTLorentzVectorsAsFundamentaFlatTree; // False by default. True: save TLorentzVector info instead as four doubles, rather than as TLorentzVector objects.
bool dSkipNoTriggerEvents; // True by default
bool dIsMCFlag; // False by default
bool dIsMCGenOnlyFlag; // False by default

//TREE INTERFACE
DTreeInterface* dTreeInterface; //for event-based tree
Expand Down Expand Up @@ -198,7 +200,8 @@ class DSelector : public TSelector

inline DSelector::DSelector(TTree* locTree) :
dInitializedFlag(false), dOption(""), dOutputFileName(""), dOutputTreeFileName(""), dFlatTreeFileName(""), dSaveDefaultFlatBranches(true),
dSaveTLorentzVectorsAsFundamentaFlatTree(false), dSkipNoTriggerEvents(true), dTreeInterface(NULL), dFlatTreeInterface(NULL),
dSaveTLorentzVectorsAsFundamentaFlatTree(false), dSkipNoTriggerEvents(true), dIsMCFlag(false), dIsMCGenOnlyFlag(false),
dTreeInterface(NULL), dFlatTreeInterface(NULL),
dAnalysisUtilities(DAnalysisUtilities()), dTargetCenter(TVector3()), dTargetP4(TLorentzVector()), dTargetPID(Unknown),
dThrownBeam(NULL), dThrownWrapper(NULL), dChargedHypoWrapper(NULL), dNeutralHypoWrapper(NULL),
dBeamWrapper(NULL), dComboWrapper(NULL), dAnalysisActions(vector<DAnalysisAction*>()),
Expand Down