hopefully final fixes

cms-sw · Aug 19, 2013 · 7bd16e0 · 7bd16e0
1 parent a3301b0
commit 7bd16e0
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 17 deletions.
diff --git a/GeneratorInterface/RivetInterface/data/CMS_EWK_11_021.aida b/GeneratorInterface/RivetInterface/data/CMS_EWK_11_021.aida
@@ -1114,6 +1114,10 @@
       <item key="Title" value="Unfold Response aux \rightarrow aux" sticky="true"/>
       <item key="AidaPath" value="/REF/d10-x01-y01" sticky="true"/>
     </annotation>
+    <dataPoint>
+      <measurement value="1.107080e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
+      <measurement value="6.248654e-04" errorPlus="1.0e10" errorMinus="1.0e10"/>
+    </dataPoint>
     <dataPoint>
       <measurement value="1.321240e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
       <measurement value="3.248128e-03" errorPlus="8.562022e-04" errorMinus="8.562022e-04"/>
@@ -1157,6 +1161,10 @@
       <item key="Title" value="Unfold Response aux \rightarrow aux" sticky="true"/>
       <item key="AidaPath" value="/REF/d11-x01-y01" sticky="true"/>
     </annotation>
+    <dataPoint>
+      <measurement value="1.107080e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
+      <measurement value="1.922091e-03" errorPlus="1.0e10" errorMinus="1.0e10"/>
+    </dataPoint>
     <dataPoint>
       <measurement value="1.321240e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
       <measurement value="7.439200e-03" errorPlus="1.979564e-03" errorMinus="1.979564e-03"/>
@@ -1200,6 +1208,10 @@
       <item key="Title" value="Unfold Response aux \rightarrow aux" sticky="true"/>
       <item key="AidaPath" value="/REF/ZJ2_3j_boosted" sticky="true"/>
     </annotation>
+    <dataPoint>
+      <measurement errorPlus="1.070800e-01" value="1.107080e+00" errorMinus="1.070800e-01"/>
+      <measurement errorPlus="1.0e10" value="2.439245e-01" errorMinus="1.0e10"/>
+    </dataPoint>
     <dataPoint>
       <measurement errorPlus="1.070800e-01" value="1.321240e+00" errorMinus="1.070800e-01"/>
       <measurement errorPlus="3.697542e-02" value="2.203887e-01" errorMinus="3.697542e-02"/>
@@ -1243,6 +1255,10 @@
       <item key="Title" value="Unfold Response aux \rightarrow aux" sticky="true"/>
       <item key="AidaPath" value="/REF/ZJ0_3j_boosted" sticky="true"/>
     </annotation>
+    <dataPoint>
+      <measurement value="1.107080e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
+      <measurement value="2.678993e-03" errorPlus="1.0e10" errorMinus="1.0e10"/>
+    </dataPoint>
     <dataPoint>
       <measurement value="1.321240e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
       <measurement value="2.338446e-02" errorPlus="1.019354e-02" errorMinus="1.019354e-02"/>
@@ -1286,6 +1302,10 @@
       <item key="Title" value="Unfold Response aux \rightarrow aux" sticky="true"/>
       <item key="AidaPath" value="/REF/ZJ1_3j_boosted" sticky="true"/>
     </annotation>
+    <dataPoint>
+      <measurement value="1.107080e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
+      <measurement value="2.636743e-01" errorPlus="1.0e10" errorMinus="1.0e10"/>
+    </dataPoint>
     <dataPoint>
       <measurement value="1.321240e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
       <measurement value="3.345433e-01" errorPlus="4.579215e-02" errorMinus="4.579215e-02"/>
@@ -1329,6 +1349,10 @@
       <item key="Title" value="Unfold Response aux \rightarrow aux" sticky="true"/>
       <item key="AidaPath" value="/REF/J1J2_3j_boosted" sticky="true"/>
     </annotation>
+    <dataPoint>
+      <measurement value="1.107080e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
+      <measurement value="4.291077e-01" errorPlus="1.0e10" errorMinus="1.0e10"/>
+    </dataPoint>
     <dataPoint>
       <measurement value="1.321240e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
       <measurement value="3.457126e-01" errorPlus="4.855760e-02" errorMinus="4.855760e-02"/>
@@ -1372,6 +1396,10 @@
       <item key="Title" value="Unfold Response aux \rightarrow aux" sticky="true"/>
       <item key="AidaPath" value="/REF/J1J3_3j_boosted" sticky="true"/>
     </annotation>  
+    <dataPoint>
+      <measurement value="1.107080e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
+      <measurement value="4.646603e-01" errorPlus="1.0e10" errorMinus="1.0e10"/>
+    </dataPoint>
     <dataPoint>
       <measurement value="1.321240e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
       <measurement value="4.562352e-01" errorPlus="6.118763e-02" errorMinus="6.118763e-02"/>
@@ -1415,6 +1443,10 @@
       <item key="Title" value="Unfold Response aux \rightarrow aux" sticky="true"/>
       <item key="AidaPath" value="/REF/J2J3_3j_boosted" sticky="true"/>
     </annotation>
+    <dataPoint>
+      <measurement value="1.107080e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
+      <measurement value="4.614759e-01" errorPlus="1.0e10" errorMinus="1.0e10"/>
+    </dataPoint>
     <dataPoint>
       <measurement value="1.321240e+00" errorPlus="1.070800e-01" errorMinus="1.070800e-01"/>
       <measurement value="4.410187e-01" errorPlus="5.255285e-02" errorMinus="5.255285e-02"/>

diff --git a/GeneratorInterface/RivetInterface/src/CMS_EWK_11_021.cc b/GeneratorInterface/RivetInterface/src/CMS_EWK_11_021.cc
@@ -166,7 +166,7 @@ namespace Rivet {
       }
     }  
 
-    void normalize(AIDA::IHistogram1D* plot, double integral){
+    void normalizeNoOverflows(AIDA::IHistogram1D* plot, double integral){
       double factor=1.;
       if (plot->sumBinHeights()>0 && plot->sumAllBinHeights()>0)
         factor = plot->sumAllBinHeights()/plot->sumBinHeights();
@@ -175,25 +175,25 @@ namespace Rivet {
 
     void finalize() 
       {
-      normalize(_histDeltaPhiZJ1,1.);
-      normalize(_histDeltaPhiZJ3,1.);
-      normalize(_histDeltaPhiZJ1_2,1.);
-      normalize(_histDeltaPhiZJ1_3,1.);
-      normalize(_histDeltaPhiZJ2_3,1.);
-      normalize(_histDeltaPhiJ1J2_3,1.);
+      normalizeNoOverflows(_histDeltaPhiZJ1,1.);
+      normalizeNoOverflows(_histDeltaPhiZJ3,1.);
+      normalizeNoOverflows(_histDeltaPhiZJ1_2,1.);
+      normalizeNoOverflows(_histDeltaPhiZJ1_3,1.);
+      normalizeNoOverflows(_histDeltaPhiZJ2_3,1.);
+      normalizeNoOverflows(_histDeltaPhiJ1J2_3,1.);
       normalize(_histTransvThrust,1.);
-      normalize(_histDeltaPhiJ1J3_3, 1.);
-      normalize(_histDeltaPhiJ2J3_3, 1.);
+      normalizeNoOverflows(_histDeltaPhiJ1J3_3, 1.);
+      normalizeNoOverflows(_histDeltaPhiJ2J3_3, 1.);
       // Boosted
-      normalize(_histBoostedDeltaPhiZJ1,1.);
-      normalize(_histBoostedDeltaPhiZJ3,1.);
-      normalize(_histBoostedDeltaPhiZJ1_2,1.);
-      normalize(_histBoostedDeltaPhiZJ1_3,1.);
-      normalize(_histBoostedDeltaPhiZJ2_3,1.);
-      normalize(_histBoostedDeltaPhiJ1J2_3,1.);
+      normalizeNoOverflows(_histBoostedDeltaPhiZJ1,1.);
+      normalizeNoOverflows(_histBoostedDeltaPhiZJ3,1.);
+      normalizeNoOverflows(_histBoostedDeltaPhiZJ1_2,1.);
+      normalizeNoOverflows(_histBoostedDeltaPhiZJ1_3,1.);
+      normalizeNoOverflows(_histBoostedDeltaPhiZJ2_3,1.);
+      normalizeNoOverflows(_histBoostedDeltaPhiJ1J2_3,1.);
       normalize(_histBoostedTransvThrust,1.);
-      normalize(_histBoostedDeltaPhiJ1J3_3, 1.);
-      normalize(_histBoostedDeltaPhiJ2J3_3, 1.);
+      normalizeNoOverflows(_histBoostedDeltaPhiJ1J3_3, 1.);
+      normalizeNoOverflows(_histBoostedDeltaPhiJ2J3_3, 1.);
      }