[Rivet-svn] rivet: Fix analyses after CounterPtr bool conversion was fixed.

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/bb57520a98c6
branches:  multiweight
changeset: 6239:bb57520a98c6
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Feb 07 15:22:41 2018 +0000
description:
Fix analyses after CounterPtr bool conversion was fixed.

diffs (truncated from 2391 to 50 lines):

--- a/analyses/pluginALICE/ALICE_2010_S8625980.cc	Wed Feb 07 13:08:52 2018 +0000
+++ b/analyses/pluginALICE/ALICE_2010_S8625980.cc	Wed Feb 07 15:22:41 2018 +0000
@@ -69,7 +69,7 @@
       if (fuzzyEquals(sqrtS()/GeV, 7000, 1E-3)) {
         normalize(_h_dN_dNch);
       }
-      scale(_h_dN_deta, 1.0/_Nevt_after_cuts);
+      scale(_h_dN_deta, 1.0/ *_Nevt_after_cuts);
 
     }
 
--- a/analyses/pluginALICE/ALICE_2010_S8706239.cc	Wed Feb 07 13:08:52 2018 +0000
+++ b/analyses/pluginALICE/ALICE_2010_S8706239.cc	Wed Feb 07 15:22:41 2018 +0000
@@ -70,7 +70,7 @@
 
     /// Normalise histograms etc., after the run
     void finalize() {
-      scale(_h_pT, 1.0/_Nevt_after_cuts);
+      scale(_h_pT, 1.0/ *_Nevt_after_cuts);
     }
 
     //@}
--- a/analyses/pluginATLAS/ATLAS_2011_I944826.cc	Wed Feb 07 13:08:52 2018 +0000
+++ b/analyses/pluginATLAS/ATLAS_2011_I944826.cc	Wed Feb 07 15:22:41 2018 +0000
@@ -211,19 +211,19 @@
 
     /// Normalise histograms etc., after the run
     void finalize() {
-      MSG_DEBUG("# Events that pass the trigger: " << double(_sum_w_passed));
-      MSG_DEBUG("# Kshort events: " << double(_sum_w_ks));
-      MSG_DEBUG("# Lambda events: " << double(_sum_w_lambda));
+      MSG_DEBUG("# Events that pass the trigger: " << dbl(*_sum_w_passed));
+      MSG_DEBUG("# Kshort events: " << dbl(*_sum_w_ks));
+      MSG_DEBUG("# Lambda events: " << dbl(*_sum_w_lambda));
 
       /// @todo Replace with normalize()?
-      scale(_hist_Ks_pT,   1.0/_sum_w_ks);
-      scale(_hist_Ks_y,    1.0/_sum_w_ks);
-      scale(_hist_Ks_mult, 1.0/_sum_w_passed);
+      scale(_hist_Ks_pT,   1.0 / *_sum_w_ks);
+      scale(_hist_Ks_y,    1.0 / *_sum_w_ks);
+      scale(_hist_Ks_mult, 1.0 / *_sum_w_passed);
 
       /// @todo Replace with normalize()?
-      scale(_hist_L_pT,   1.0/_sum_w_lambda);
-      scale(_hist_L_y,    1.0/_sum_w_lambda);
-      scale(_hist_L_mult, 1.0/_sum_w_passed);
+      scale(_hist_L_pT,   1.0 / *_sum_w_lambda);
+      scale(_hist_L_y,    1.0 / *_sum_w_lambda);
+      scale(_hist_L_mult, 1.0 / *_sum_w_passed);