new cuts [broken]

prog/runcards/pp_phaeno_299_port/Sherpa_Base.dat

@@ -23,7 +23,7 @@
 
 (selector){
   PseudoRapidity 22 -2.5 2.5;
-  PT 22 20 200000000;
+  PT 22 15 200000000;
 }(selector)
 
 (analysis){

prog/runcards/pp_phaeno_299_port/makefile

@@ -18,10 +18,15 @@ OUT_DIR = out
 RES_DIR = results
 
 # Event Count
-EVENT_COUNT = 1000000
+EVENT_COUNT = 10
 
 # List of Runcards, see RUNCARD_FOLDER
-RUNCARDS = with_pT_and_fragmentation_and_mi basic with_jets with_jets_and_pT with_pT_and_fragmentation
+RUNCARDS = \
+	basic \
+        with_jets \
+        with_jets_and_pT \
+        #with_pT_and_fragmentation
+	#with_pT_and_fragmentation_and_mi \
 
 # Runcard Names
 BASE_RUNCARD = Sherpa_Base.dat
@@ -114,6 +119,7 @@ $(RES_PDFS): histograms
 ###############################################################################
 #                               Auto Create Dirs                              #
 ###############################################################################
+
 # Create OUT_DIR, RES_DIR if it is not present
 ifeq ("$(wildcard $(OUT_DIR))", "")
 $(info $(shell mkdir -p $(OUT_DIR) && echo "Created output directory: $(OUT_DIR)"))

prog/runcards/pp_phaeno_299_port/qqgg_proton/MC_DIPHOTON_PROTON.cc

@@ -50,7 +50,8 @@ public:
     declare(calo_fs, "calo_fs");
 
     // we chain in a prompt final state just to be save
-    PromptFinalState prompt{};
+
+    PromptFinalState prompt(Cuts::abseta <= 2.5 && Cuts::pT >= 20);
     IdentifiedFinalState ifs(prompt);
     ifs.acceptId(PID::PHOTON);
     declare(ifs, "Photons");
@@ -66,7 +67,7 @@ public:
                     {"o_angle", {0, 1}},
                     {"o_angle_cs", {0, 1}},
                     {"total_pT", {1e-5, 1100, 50, true}},
-                    {"azimuthal_angle", {1e-5, PI, 50, true}}};
+                    {"azimuthal_angle", {1e-5, PI}}};
 
     for (auto &[name, observable] : _observables) {
       if (observable._log) {
@@ -78,6 +79,7 @@ public:
       book(observable._hist, name, observable._bins, observable._min,
            observable._max);
       book(_h_XS, "xs");
+      book(_xs, "yy_xs");
     }
   }
 
@@ -144,16 +146,19 @@ public:
         photons[1].pT() /
         sqrt(sqr(_observables.at("inv_m")._value) + sqr(total_momentum.pT())) /
         _observables.at("inv_m")._value));
+
+    // Fill fiducial cross section
+    _xs->fill();
   }
 
   //@}
 
   void finalize() {
     _h_XS->addPoint(0, crossSection() / picobarn, .5, crossSectionError() / picobarn);
-
-    const double sf = crossSection() / picobarn;
+    const double sf = 1;
+    scale(_xs, sf);
     for (auto const &[_, observable] : _observables) {
-      normalize(observable._hist, sf);
+      scale(observable._hist, sf);
     }
   }
 
@@ -161,6 +166,7 @@ public:
   //@{
   std::map<const std::string, Observable> _observables;
   Scatter2DPtr _h_XS;
+  CounterPtr _xs;
   //@}
 };
 

prog/runcards/pp_phaeno_299_port/qqgg_proton/MC_DIPHOTON_PROTON.plot

@@ -29,6 +29,8 @@ Title=$m_{\gamma\gamma}$ of the two leading photons
 XLabel=$m_{\gamma\gamma}$ [GeV]
 YLabel=$\mathrm{d}\sigma/\mathrm{d}m_{\gamma\gamma}$ [pb GeV$^{-1}$]
 LogX=1
+XMin=1
+XMax=400
 # END PLOT
 
 # BEGIN PLOT /MC_DIPHOTON_PROTON/eta