[Rivet-svn] r3923 - branches/2012-06-aidarivet branches/2012-06-aidarivet/src/Analyses trunk trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue Sep  4 15:57:53 2012
New Revision: 3923

Log:
Bugfix in ALEPH_2004_S5765862 (thanks to Anil Pratap)

Modified:
   branches/2012-06-aidarivet/ChangeLog
   branches/2012-06-aidarivet/src/Analyses/ALEPH_2004_S5765862.cc
   trunk/ChangeLog
   trunk/src/Analyses/ALEPH_2004_S5765862.cc

Modified: branches/2012-06-aidarivet/ChangeLog
==============================================================================
--- branches/2012-06-aidarivet/ChangeLog	Tue Sep  4 15:27:49 2012	(r3922)
+++ branches/2012-06-aidarivet/ChangeLog	Tue Sep  4 15:57:53 2012	(r3923)
@@ -2,6 +2,8 @@
 
 	* Cleanup and multiple fixes in CMS_2011_S9120041
 
+	* Bugfix in ALEPH_2004_S5765862 (thanks to Anil Pratap)
+
 2012-08-09  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Fixing aida2root command-line help message and converting to TH*

Modified: branches/2012-06-aidarivet/src/Analyses/ALEPH_2004_S5765862.cc
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ALEPH_2004_S5765862.cc	Tue Sep  4 15:27:49 2012	(r3922)
+++ branches/2012-06-aidarivet/src/Analyses/ALEPH_2004_S5765862.cc	Tue Sep  4 15:57:53 2012	(r3923)
@@ -53,16 +53,16 @@
       // offset for the event shapes and jets
       int offset = 0;
       switch (int(sqrtS()/GeV + 0.5)) {
-      case 91: offset = 0; break;
-      case 133: offset = 1; break;
-      case 161: offset = 2; break;
-      case 172: offset = 3; break;
-      case 183: offset = 4; break;
-      case 189: offset = 5; break;
-      case 200: offset = 6; break;
-      case 206: offset = 7; break;
-      default:
-        _initialisedJets = false;
+        case 91: offset = 0; break;
+        case 133: offset = 1; break;
+        case 161: offset = 2; break;
+        case 172: offset = 3; break;
+        case 183: offset = 4; break;
+        case 189: offset = 5; break;
+        case 200: offset = 6; break;
+        case 206: offset = 7; break;
+        default:
+          _initialisedJets = false;
       }
       // event shapes
       if(_initialisedJets) {
@@ -109,16 +109,16 @@
       // offset for the charged particle distributions
       offset = 0;
       switch (int(sqrtS()/GeV + 0.5)) {
-      case 133: offset = 0; break;
-      case 161: offset = 1; break;
-      case 172: offset = 2; break;
-      case 183: offset = 3; break;
-      case 189: offset = 4; break;
-      case 196: offset = 5; break;
-      case 200: offset = 6; break;
-      case 206: offset = 7; break;
-      default:
-        _initialisedSpectra=false;
+        case 133: offset = 0; break;
+        case 161: offset = 1; break;
+        case 172: offset = 2; break;
+        case 183: offset = 3; break;
+        case 189: offset = 4; break;
+        case 196: offset = 5; break;
+        case 200: offset = 6; break;
+        case 206: offset = 7; break;
+        default:
+          _initialisedSpectra=false;
       }
       if (_initialisedSpectra) {
         _h_xp = bookHistogram1D( 2+offset, 1, 1);
@@ -227,11 +227,11 @@
           const double momT = dot(thrust.thrustAxis()        ,p.momentum().vector3());
           const double rapidityT = 0.5 * std::log((p.momentum().E() + momT) /
                                                   (p.momentum().E() - momT));
-          _h_rapidityT->fill(rapidityT, weight);
+          _h_rapidityT->fill(fabs(rapidityT), weight);
           const double momS = dot(sphericity.sphericityAxis(),p.momentum().vector3());
           const double rapidityS = 0.5 * std::log((p.momentum().E() + momS) /
                                                   (p.momentum().E() - momS));
-          _h_rapidityS->fill(rapidityS, weight);
+          _h_rapidityS->fill(fabs(rapidityS), weight);
         }
       }
     }

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Sep  4 15:27:49 2012	(r3922)
+++ trunk/ChangeLog	Tue Sep  4 15:57:53 2012	(r3923)
@@ -2,6 +2,8 @@
 
 	* Cleanup and multiple fixes in CMS_2011_S9120041
 
+	* Bugfix in ALEPH_2004_S5765862 (thanks to Anil Pratap)
+
 2012-08-09  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Fixing aida2root command-line help message and converting to TH*

Modified: trunk/src/Analyses/ALEPH_2004_S5765862.cc
==============================================================================
--- trunk/src/Analyses/ALEPH_2004_S5765862.cc	Tue Sep  4 15:27:49 2012	(r3922)
+++ trunk/src/Analyses/ALEPH_2004_S5765862.cc	Tue Sep  4 15:57:53 2012	(r3923)
@@ -53,16 +53,16 @@
       // offset for the event shapes and jets
       int offset = 0;
       switch (int(sqrtS()/GeV + 0.5)) {
-      case 91: offset = 0; break;
-      case 133: offset = 1; break;
-      case 161: offset = 2; break;
-      case 172: offset = 3; break;
-      case 183: offset = 4; break;
-      case 189: offset = 5; break;
-      case 200: offset = 6; break;
-      case 206: offset = 7; break;
-      default:
-        _initialisedJets = false;
+        case 91: offset = 0; break;
+        case 133: offset = 1; break;
+        case 161: offset = 2; break;
+        case 172: offset = 3; break;
+        case 183: offset = 4; break;
+        case 189: offset = 5; break;
+        case 200: offset = 6; break;
+        case 206: offset = 7; break;
+        default:
+          _initialisedJets = false;
       }
       // event shapes
       if(_initialisedJets) {
@@ -109,16 +109,16 @@
       // offset for the charged particle distributions
       offset = 0;
       switch (int(sqrtS()/GeV + 0.5)) {
-      case 133: offset = 0; break;
-      case 161: offset = 1; break;
-      case 172: offset = 2; break;
-      case 183: offset = 3; break;
-      case 189: offset = 4; break;
-      case 196: offset = 5; break;
-      case 200: offset = 6; break;
-      case 206: offset = 7; break;
-      default:
-        _initialisedSpectra=false;
+        case 133: offset = 0; break;
+        case 161: offset = 1; break;
+        case 172: offset = 2; break;
+        case 183: offset = 3; break;
+        case 189: offset = 4; break;
+        case 196: offset = 5; break;
+        case 200: offset = 6; break;
+        case 206: offset = 7; break;
+        default:
+          _initialisedSpectra=false;
       }
       if (_initialisedSpectra) {
         _h_xp = bookHisto1D( 2+offset, 1, 1);
@@ -227,11 +227,11 @@
           const double momT = dot(thrust.thrustAxis()        ,p.momentum().vector3());
           const double rapidityT = 0.5 * std::log((p.momentum().E() + momT) /
                                                   (p.momentum().E() - momT));
-          _h_rapidityT->fill(rapidityT, weight);
+          _h_rapidityT->fill(fabs(rapidityT), weight);
           const double momS = dot(sphericity.sphericityAxis(),p.momentum().vector3());
           const double rapidityS = 0.5 * std::log((p.momentum().E() + momS) /
                                                   (p.momentum().E() - momS));
-          _h_rapidityS->fill(rapidityS, weight);
+          _h_rapidityS->fill(fabs(rapidityS), weight);
         }
       }
     }