be more consistent with jets

Author: c-dilks

src/Analysis.cxx

@@ -48,6 +48,15 @@ Analysis::Analysis(
   availableBinSchemes.insert({ "JetPT", "jet p_{T}" });
   availableBinSchemes.insert({ "JetZ",  "jet z"     });
 #endif
+  /* dihadrons */
+  availableBinSchemes.insert({ "DihMh",     "M_{h}"    });
+  availableBinSchemes.insert({ "DihMX",     "M_{X}"    });
+  availableBinSchemes.insert({ "DihZ",      "Z"        });
+  availableBinSchemes.insert({ "DihPhPerp", "P_{h,T}"  });
+  availableBinSchemes.insert({ "DihTheta",  "#theta"   });
+  availableBinSchemes.insert({ "DihPhiH",   "#phi_{h}" });
+  availableBinSchemes.insert({ "DihPhiR",   "#phi_{R}" });
+  availableBinSchemes.insert({ "DihPhiS",   "#phi_{S}" });
 
   // available final states
   // - specify which final states you want to include using `AddFinalState(TString name)`
@@ -67,16 +76,6 @@ Analysis::Analysis(
   PIDtoFinalState.insert({ -321,  "KmTrack"  });
   PIDtoFinalState.insert({  2212, "pTrack"   });
 
-  // dihadrons
-  availableBinSchemes.insert({ "DihMh",     "M_{h}"    });
-  availableBinSchemes.insert({ "DihMX",     "M_{X}"    });
-  availableBinSchemes.insert({ "DihZ",      "Z"        });
-  availableBinSchemes.insert({ "DihPhPerp", "P_{h,T}"  });
-  availableBinSchemes.insert({ "DihTheta",  "#theta"   });
-  availableBinSchemes.insert({ "DihPhiH",   "#phi_{h}" });
-  availableBinSchemes.insert({ "DihPhiR",   "#phi_{R}" });
-  availableBinSchemes.insert({ "DihPhiS",   "#phi_{S}" });
-
   // kinematics reconstruction methods
   // - choose one of these methods using `SetReconMethod(TString name)`
   // - if you specify none, a default method will be chosen
@@ -317,18 +316,6 @@ void Analysis::Prepare() {
   }
 #endif
 
-  // if there are no final states defined, default to definitions here:
-  if(BinScheme("finalState")->GetNumBins()==0) {
-    std::cout << "NOTE: adding pi+ tracks for final state, since you specified none" << std::endl;
-    AddFinalState("pipTrack");
-  };
-
-  // if no reconstruction method is set, choose a default here
-  if(reconMethod=="") {
-    std::cout << "NOTE: no recon method specified, default to electron method" << std::endl;
-    SetReconMethod("Ele");
-  };
-
   // if including dihadrons, define a dihadron final state
   if(includeOutputSet["2h"]) {
     if(activeFinalStates.size()!=2) {
@@ -350,12 +337,23 @@ void Analysis::Prepare() {
       dihadronTitle += " dihadrons";
       // add the new dihadron final state
       finalStateToTitle.insert({dihadronFinalState,dihadronTitle});
-      fmt::print("DEFINE DIHADRON finalStateID='{}'  title='{}'\n",dihadronFinalState,dihadronTitle);
       AddFinalState(dihadronFinalState);
       dihSet->SetFinalStateID(dihadronFinalState);
     }
   }
 
+  // if there are no final states defined, default to definitions here:
+  if(BinScheme("finalState")->GetNumBins()==0) {
+    std::cout << "NOTE: adding pi+ tracks for final state, since you specified none" << std::endl;
+    AddFinalState("pipTrack");
+  };
+
+  // if no reconstruction method is set, choose a default here
+  if(reconMethod=="") {
+    std::cout << "NOTE: no recon method specified, default to electron method" << std::endl;
+    SetReconMethod("Ele");
+  };
+
   // build HistosDAG with specified binning
   HD = new HistosDAG();
   HD->Build(binSchemes);