Merge pull request #180 from JeffersonLab/aaust_PIDFOM_flat_fix

aaust · web-flow · commit f7897b071963 · 2025-03-27T12:20:21.000-04:00
bug fix
diff --git a/libraries/DSelector/DSelector.cc b/libraries/DSelector/DSelector.cc
@@ -850,7 +850,7 @@ void DSelector::Fill_FlatBranches(DKinematicData* locParticle, bool locIsMCFlag)
 		}
 	       
 		// Global PID
-        if(dTreeInterface->Get_Branch(locEventBranchPrefix + "__PIDFOM") != NULL)
+        if(dTreeInterface->Get_Branch("ChargedHypo__PIDFOM") != NULL)
             dFlatTreeInterface->Fill_Fundamental<Float_t>(locBranchPrefix + "_pid_fom", locChargedTrackHypothesis->Get_PIDFOM());
 
 		//timing
diff --git a/programs/tree_to_amptools/tree_to_amptools.cc b/programs/tree_to_amptools/tree_to_amptools.cc
@@ -53,7 +53,7 @@ int main(int argc, char* argv[])
 	    cout << "Weights set to " << locWeight <<"!";
 	    cout << endl;
 	  }
-	  if (arg == "-gen"){
+	  else if (arg == "-gen"){
 	    locGen = true;
 	    cout << "Fill tree with generated events" << endl;
 	  }

Original file line number	Diff line number	Diff line change
`@@ -850,7 +850,7 @@ void DSelector::Fill_FlatBranches(DKinematicData* locParticle, bool locIsMCFlag)`
`850`	`850`	`}`
`851`	`851`
`852`	`852`	`// Global PID`
`853`		`- if(dTreeInterface->Get_Branch(locEventBranchPrefix + "__PIDFOM") != NULL)`
	`853`	`+ if(dTreeInterface->Get_Branch("ChargedHypo__PIDFOM") != NULL)`
`854`	`854`	`dFlatTreeInterface->Fill_Fundamental<Float_t>(locBranchPrefix + "_pid_fom", locChargedTrackHypothesis->Get_PIDFOM());`
`855`	`855`
`856`	`856`	`//timing`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ int main(int argc, char* argv[])`
`53`	`53`	`cout << "Weights set to " << locWeight <<"!";`
`54`	`54`	`cout << endl;`
`55`	`55`	`}`
`56`		`- if (arg == "-gen"){`
	`56`	`+ else if (arg == "-gen"){`
`57`	`57`	`locGen = true;`
`58`	`58`	`cout << "Fill tree with generated events" << endl;`
`59`	`59`	`}`