Add ptshape suffix to input histos and output files in makenormyields

Author: saganatt

machine_learning_hep/analysis/analyzerdhadrons.py

@@ -486,11 +486,13 @@ def makenormyields(self):  # pylint: disable=import-outside-toplevel, too-many-b
         if not os.path.exists(fileouteff):
             self.logger.fatal("Efficiency file %s could not be found", fileouteff)
 
-        fileoutcross = f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}.root"
+        ptshape = "_ptshape" if self.do_ptshape else ""
+        fileoutcross = f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}{ptshape}.root"
 
         namehistoeffprompt = "eff"
-        namehistoefffeed = "eff_fd"
+        namehistoefffeed = f"eff_fd{ptshape}"
         nameyield = "hyields0"
+        self.logger.info("Using efficiency histos %s, %s", namehistoeffprompt, namehistoefffeed)
 
         histonorm = TH1F("histonorm", "histonorm", 1, 0, 1)
 
@@ -537,7 +539,8 @@ def makenormyields(self):  # pylint: disable=import-outside-toplevel, too-many-b
             fileoutcross,
         )
 
-        fileoutcrosstot = TFile.Open(f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}tot.root", "recreate")
+        fileoutcrosstot = TFile.Open(f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}tot{ptshape}.root",
+                                     "recreate")
 
         f_fileoutcross = TFile.Open(fileoutcross)
         if f_fileoutcross: