[Rivet-svn] r2543 - trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Mon Jun 28 10:19:50 2010
New Revision: 2543

Log:
Use exclusive_ymerge_max instead of exclusive_ymerge for jet resolutions from FastJet. We noticed that this does make a considerable difference for the JADE algorithm, so it's probably better to do it for the others as well.

Modified:
   trunk/src/Analyses/ALEPH_1996_S3486095.cc
   trunk/src/Analyses/ALEPH_2004_S5765862.cc
   trunk/src/Analyses/DELPHI_1996_S3430090.cc
   trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc
   trunk/src/Analyses/OPAL_2004_S6132243.cc

Modified: trunk/src/Analyses/ALEPH_1996_S3486095.cc
==============================================================================
--- trunk/src/Analyses/ALEPH_1996_S3486095.cc	Sun Jun 27 22:45:30 2010	(r2542)
+++ trunk/src/Analyses/ALEPH_1996_S3486095.cc	Mon Jun 28 10:19:50 2010	(r2543)
@@ -165,7 +165,7 @@
       getLog() << Log::DEBUG << "Calculating differential jet rate plots:" << endl;
       const FastJets& durjet = applyProjection<FastJets>(e, "DurhamJets");
       if (durjet.clusterSeq()) {
-        double y3 = durjet.clusterSeq()->exclusive_ymerge(2);
+        double y3 = durjet.clusterSeq()->exclusive_ymerge_max(2);
         _histY3->fill(-1. * std::log(y3), weight);
       }
 

Modified: trunk/src/Analyses/ALEPH_2004_S5765862.cc
==============================================================================
--- trunk/src/Analyses/ALEPH_2004_S5765862.cc	Sun Jun 27 22:45:30 2010	(r2542)
+++ trunk/src/Analyses/ALEPH_2004_S5765862.cc	Mon Jun 28 10:19:50 2010	(r2543)
@@ -129,7 +129,7 @@
       const FastJets& durjet = applyProjection<FastJets>(e, "DurhamJets");
       if (durjet.clusterSeq()) {
         for (int i=0; i<5; ++i) {
-          _h_y_Durham[i]->fill(-log(durjet.clusterSeq()->exclusive_ymerge(i+1)), weight);
+          _h_y_Durham[i]->fill(-log(durjet.clusterSeq()->exclusive_ymerge_max(i+1)), weight);
         }
       }
     }

Modified: trunk/src/Analyses/DELPHI_1996_S3430090.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_1996_S3430090.cc	Sun Jun 27 22:45:30 2010	(r2542)
+++ trunk/src/Analyses/DELPHI_1996_S3430090.cc	Mon Jun 28 10:19:50 2010	(r2543)
@@ -179,18 +179,18 @@
       const FastJets& jadejet = applyProjection<FastJets>(e, "JadeJets");
       if (numParticles >= 3) {
         _passedCut3WeightSum += weight;
-        if (durjet.clusterSeq()) _histDiffRate2Durham->fill(durjet.clusterSeq()->exclusive_ymerge(2), weight);
-        if (jadejet.clusterSeq()) _histDiffRate2Jade->fill(jadejet.clusterSeq()->exclusive_ymerge(2), weight);
+        if (durjet.clusterSeq()) _histDiffRate2Durham->fill(durjet.clusterSeq()->exclusive_ymerge_max(2), weight);
+        if (jadejet.clusterSeq()) _histDiffRate2Jade->fill(jadejet.clusterSeq()->exclusive_ymerge_max(2), weight);
       }
       if (numParticles >= 4) {
         _passedCut4WeightSum += weight;
-        if (durjet.clusterSeq()) _histDiffRate3Durham->fill(durjet.clusterSeq()->exclusive_ymerge(3), weight);
-        if (jadejet.clusterSeq()) _histDiffRate3Jade->fill(jadejet.clusterSeq()->exclusive_ymerge(3), weight);
+        if (durjet.clusterSeq()) _histDiffRate3Durham->fill(durjet.clusterSeq()->exclusive_ymerge_max(3), weight);
+        if (jadejet.clusterSeq()) _histDiffRate3Jade->fill(jadejet.clusterSeq()->exclusive_ymerge_max(3), weight);
       }
       if (numParticles >= 5) {
         _passedCut5WeightSum += weight;
-        if (durjet.clusterSeq()) _histDiffRate4Durham->fill(durjet.clusterSeq()->exclusive_ymerge(4), weight);
-        if (jadejet.clusterSeq()) _histDiffRate4Jade->fill(jadejet.clusterSeq()->exclusive_ymerge(4), weight);
+        if (durjet.clusterSeq()) _histDiffRate4Durham->fill(durjet.clusterSeq()->exclusive_ymerge_max(4), weight);
+        if (jadejet.clusterSeq()) _histDiffRate4Jade->fill(jadejet.clusterSeq()->exclusive_ymerge_max(4), weight);
       }
 
       // Sphericities

Modified: trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc	Sun Jun 27 22:45:30 2010	(r2542)
+++ trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc	Mon Jun 28 10:19:50 2010	(r2543)
@@ -132,8 +132,8 @@
           _histDurhamNR->fill(fabs(calc_NR(jets_durham)), weight);
           _histDurhamALPHA34->fill(calc_ALPHA34(jets_durham), weight);
         }
-        if (durjet.clusterSeq()->exclusive_ymerge(3) > 0.008 &&
-            durjet.clusterSeq()->exclusive_ymerge(4) < 0.008) {
+        if (durjet.clusterSeq()->exclusive_ymerge_max(3) > 0.008 &&
+            durjet.clusterSeq()->exclusive_ymerge_max(4) < 0.008) {
           _numdurjets++;
         }
       }
@@ -148,8 +148,8 @@
           _histJadeNR->fill(fabs(calc_NR(jets_jade)), weight);
           _histJadeALPHA34->fill(calc_ALPHA34(jets_jade), weight);
         }
-        if (jadejet.clusterSeq()->exclusive_ymerge(3) > 0.015 &&
-            jadejet.clusterSeq()->exclusive_ymerge(4) < 0.015) {
+        if (jadejet.clusterSeq()->exclusive_ymerge_max(3) > 0.015 &&
+            jadejet.clusterSeq()->exclusive_ymerge_max(4) < 0.015) {
           _numjadejets++;
         }
       }

Modified: trunk/src/Analyses/OPAL_2004_S6132243.cc
==============================================================================
--- trunk/src/Analyses/OPAL_2004_S6132243.cc	Sun Jun 27 22:45:30 2010	(r2542)
+++ trunk/src/Analyses/OPAL_2004_S6132243.cc	Mon Jun 28 10:19:50 2010	(r2543)
@@ -124,7 +124,7 @@
       const FastJets& durjet = applyProjection<FastJets>(event, "DurhamJets");
       if (durjet.clusterSeq()) {
         _sumWJet3 += weight;
-        const double y23 = durjet.clusterSeq()->exclusive_ymerge(2);
+        const double y23 = durjet.clusterSeq()->exclusive_ymerge_max(2);
         _histY23Durham[_isqrts]->fill(y23, weight);
         for (int n = 1; n <= 5; ++n) {
           _histY23DurhamMom[_isqrts]->fill(n, pow(y23, n)*weight);