[Rivet-svn] r2541 - in trunk: . src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun Jun 27 22:40:23 2010
New Revision: 2541

Log:
Converting JADE_OPAL analysis to use the fastjet exclusive_ymerge_*max* function, rather than just exclusive_ymerge: everything looks good now. It seems that fastjet >= 2.4.2 is needed for this to work properly: otherwise there will be crashes.

Modified:
   trunk/ChangeLog
   trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Sun Jun 27 18:10:41 2010	(r2540)
+++ trunk/ChangeLog	Sun Jun 27 22:40:23 2010	(r2541)
@@ -1,3 +1,10 @@
+2010-06-27  Andy Buckley  <andy at insectnation.org>
+
+	* Converting JADE_OPAL analysis to use the fastjet
+	exclusive_ymerge_*max* function, rather than just
+	exclusive_ymerge: everything looks good now. It seems that fastjet
+	>= 2.4.2 is needed for this to work properly.
+
 2010-06-24  Andy Buckley  <andy at insectnation.org>
 
 	* Making rivet-buildplugin look in its own bin directory when

Modified: trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc
==============================================================================
--- trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc	Sun Jun 27 18:10:41 2010	(r2540)
+++ trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc	Sun Jun 27 22:40:23 2010	(r2541)
@@ -67,10 +67,10 @@
       const FastJets& jadejet = applyProjection<FastJets>(e, "JadeJets");
       if (jadejet.clusterSeq()) {
         /// @todo Put this in an index loop?
-        double y_23 = jadejet.clusterSeq()->exclusive_ymerge(2);
-        double y_34 = jadejet.clusterSeq()->exclusive_ymerge(3);
-        double y_45 = jadejet.clusterSeq()->exclusive_ymerge(4);
-        double y_56 = jadejet.clusterSeq()->exclusive_ymerge(5);
+        double y_23 = jadejet.clusterSeq()->exclusive_ymerge_max(2);
+        double y_34 = jadejet.clusterSeq()->exclusive_ymerge_max(3);
+        double y_45 = jadejet.clusterSeq()->exclusive_ymerge_max(4);
+        double y_56 = jadejet.clusterSeq()->exclusive_ymerge_max(5);
 
         for (int i = 0; i < _h_R_Jade[0]->size(); ++i) {
           IDataPoint* dp = _h_R_Jade[0]->point(i);
@@ -111,10 +111,10 @@
       const FastJets& durjet = applyProjection<FastJets>(e, "DurhamJets");
       if (durjet.clusterSeq()) {
         /// @todo Put this in an index loop?
-        double y_23 = durjet.clusterSeq()->exclusive_ymerge(2);
-        double y_34 = durjet.clusterSeq()->exclusive_ymerge(3);
-        double y_45 = durjet.clusterSeq()->exclusive_ymerge(4);
-        double y_56 = durjet.clusterSeq()->exclusive_ymerge(5);
+        double y_23 = durjet.clusterSeq()->exclusive_ymerge_max(2);
+        double y_34 = durjet.clusterSeq()->exclusive_ymerge_max(3);
+        double y_45 = durjet.clusterSeq()->exclusive_ymerge_max(4);
+        double y_56 = durjet.clusterSeq()->exclusive_ymerge_max(5);
 
         _h_y_Durham[0]->fill(y_23, weight);
         _h_y_Durham[1]->fill(y_34, weight);