[Rivet-svn] rivet: Fallback for sqrtS if running without beams -- more fallb...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6888f2565274
branches:  
changeset: 4826:6888f2565274
user:      Frank Siegert <frank.siegert at cern.ch>
date:      Wed Jul 29 11:00:22 2015 +0200
description:
Fallback for sqrtS if running without beams -- more fallback cases in addition to changeset 4750:118f8d172451.

diffs (truncated from 238 to 50 lines):

--- a/src/Analyses/MC_DIPHOTON.cc	Thu Jul 23 17:15:56 2015 +0100
+++ b/src/Analyses/MC_DIPHOTON.cc	Wed Jul 29 11:00:22 2015 +0200
@@ -29,8 +29,8 @@
       ifs.acceptId(PID::PHOTON);
       addProjection(ifs, "IFS");
 
-      _h_m_PP = bookHisto1D("m_PP", logspace(50, 1.0, 0.25*sqrtS()));
-      _h_pT_PP = bookHisto1D("pT_PP", logspace(50, 1.0, 0.25*sqrtS()));
+      _h_m_PP = bookHisto1D("m_PP", logspace(50, 1.0, 0.25*(sqrtS()>0.?sqrtS():14000.)));
+      _h_pT_PP = bookHisto1D("pT_PP", logspace(50, 1.0, 0.25*(sqrtS()>0.?sqrtS():14000.)));
       _h_pT_P1 = bookHisto1D("pT_P1", 50, 0.0, 70.0);
       _h_pT_P2 = bookHisto1D("pT_P2", 50, 0.0, 70.0);
       _h_dphi_PP = bookHisto1D("dphi_PP", 20, 0.0, M_PI);
--- a/src/Analyses/MC_HINC.cc	Thu Jul 23 17:15:56 2015 +0100
+++ b/src/Analyses/MC_HINC.cc	Wed Jul 29 11:00:22 2015 +0200
@@ -25,11 +25,11 @@
       ZFinder hfinder(FinalState(), cut, PID::TAU, 115*GeV, 135*GeV, 0.0, ZFinder::NOCLUSTER, ZFinder::NOTRACK, 125*GeV);
       addProjection(hfinder, "Hfinder");
       _h_H_mass = bookHisto1D("H_mass", 50, 119.7, 120.3);
-      _h_H_pT = bookHisto1D("H_pT", logspace(100, 1.0, 0.5*sqrtS()/GeV));
+      _h_H_pT = bookHisto1D("H_pT", logspace(100, 1.0, 0.5*(sqrtS()>0.?sqrtS():14000.)/GeV));
       _h_H_pT_peak = bookHisto1D("H_pT_peak", 25, 0.0, 25.0);
       _h_H_y = bookHisto1D("H_y", 40, -4, 4);
       _h_H_phi = bookHisto1D("H_phi", 25, 0.0, TWOPI);
-      _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS()/GeV));
+      _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*(sqrtS()>0.?sqrtS():14000.)/GeV));
       _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4, 4);
     }
 
--- a/src/Analyses/MC_PHOTONINC.cc	Thu Jul 23 17:15:56 2015 +0100
+++ b/src/Analyses/MC_PHOTONINC.cc	Wed Jul 29 11:00:22 2015 +0200
@@ -37,7 +37,7 @@
       vfs.addVetoOnThisFinalState(photonfs);
       addProjection(vfs, "JetFS");
 
-      _h_photon_pT = bookHisto1D("photon_pT", logspace(50, 30.0, 0.5*sqrtS()));
+      _h_photon_pT = bookHisto1D("photon_pT", logspace(50, 30.0, 0.5*(sqrtS()>0.?sqrtS():14000.)));
       _h_photon_pT_lin = bookHisto1D("photon_pT_lin", 50, 0.0, 70.0);
       _h_photon_y = bookHisto1D("photon_y", 50, -5.0, 5.0);
     }
--- a/src/Analyses/MC_PHOTONS.cc	Thu Jul 23 17:15:56 2015 +0100
+++ b/src/Analyses/MC_PHOTONS.cc	Wed Jul 29 11:00:22 2015 +0200
@@ -41,7 +41,7 @@
       _h_Ptgamma = bookHisto1D("Ptgamma", logspace(50, 0.01, 30));
       _h_Egamma = bookHisto1D("Egamma", logspace(50, 0.01, 200));
       _h_sumPtgamma = bookHisto1D("sumPtgamma", 50, 0, 100);
-      _h_sumEgamma = bookHisto1D("sumEgamma", 50, 0, sqrtS()/GeV/5.0);
+      _h_sumEgamma = bookHisto1D("sumEgamma", 50, 0, (sqrtS()>0.?sqrtS():14000.)/GeV/5.0);
       _h_DelR = bookHisto1D("DeltaR", 50, 0, 2);
       _h_DelR_weighted = bookHisto1D("DeltaR_ptweighted", 50, 0, 2);