[Rivet-svn] r3219 - branches/2011-07-aida2yoda/src/Analyses

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Tue Jul 19 18:39:14 2011
New Revision: 3219

Log:
LEP

Modified:
   branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc
   branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc
   branches/2011-07-aida2yoda/src/Analyses/Makefile.am

Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc	Tue Jul 19 18:33:53 2011	(r3218)
+++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc	Tue Jul 19 18:39:14 2011	(r3219)
@@ -76,7 +76,7 @@
         _h_thrustminor = bookHisto1D(offset+102, 1, 1);
         _h_jetmassdifference = bookHisto1D(offset+110, 1, 1);
         _h_aplanarity = bookHisto1D(offset+118, 1, 1);
-        _h_planarity  = offset==0 ? NULL : bookHisto1D(offset+125, 1, 1);
+        _h_planarity  = offset==0 ? Histo1DPtr() : bookHisto1D(offset+125, 1, 1);
         _h_oblateness = bookHisto1D(offset+133, 1, 1);
         _h_sphericity = bookHisto1D(offset+141, 1, 1);
 
@@ -89,9 +89,9 @@
           _h_y_Durham[4] = bookHisto1D(offset+180, 1, 1); // y56 d180 ... d186
         }
         else if (offset==6) {
-          _h_y_Durham[2] = NULL;
-          _h_y_Durham[3] = NULL;
-          _h_y_Durham[4] = NULL;
+          _h_y_Durham[2].reset();
+          _h_y_Durham[3].reset();
+          _h_y_Durham[4].reset();
         }
         else if (offset==7) {
           _h_y_Durham[2] = bookHisto1D(172, 1, 1);
@@ -126,7 +126,7 @@
         _h_xi = bookHisto1D(11+offset, 1, 1);
         _h_xe = bookHisto1D(19+offset, 1, 1);
         _h_pTin  = bookHisto1D(27+offset, 1, 1);
-        _h_pTout = offset!=7 ? NULL : bookHisto1D(35, 1, 1);
+        _h_pTout = offset!=7 ? Histo1DPtr() : bookHisto1D(35, 1, 1);
         _h_rapidityT = bookHisto1D(36+offset, 1, 1);
         _h_rapidityS = bookHisto1D(44+offset, 1, 1);
       }
@@ -183,21 +183,21 @@
               _h_y_Durham[i]->fill(logyn, weight);
             }
             if(!LEP1) logyn *= log10e;
-            for (int j = 0; j < _h_R_Durham[i]->size(); ++j) {
-              IDataPoint* dp = _h_R_Durham[i]->point(j);
-              double val = -dp->coordinate(0)->value()+dp->coordinate(0)->errorMinus();
+            for (size_t j = 0; j < _h_R_Durham[i]->numPoints(); ++j) {
+              Point2D & dp = _h_R_Durham[i]->point(j);
+              double val = -dp.xMin();
               if(val<=logynm1) break;
               if(val<logyn) {
-                dp->coordinate(1)->setValue(dp->coordinate(1)->value()+weight);
+                dp.setY(dp.y()+weight);
               }
             }
             logynm1 = logyn;
           }
-          for (int j = 0; j < _h_R_Durham[5]->size(); ++j) {
-            IDataPoint* dp = _h_R_Durham[5]->point(j);
-            double val = -dp->coordinate(0)->value()+dp->coordinate(0)->errorMinus();
+          for (size_t j = 0; j < _h_R_Durham[5]->numPoints(); ++j) {
+            Point2D & dp = _h_R_Durham[5]->point(j);
+            double val = -dp.xMin();
             if(val<=logynm1) break;
-            dp->coordinate(1)->setValue(dp->coordinate(1)->value()+weight);
+            dp.setY(dp.y()+weight);
           }
         }
         if( !_initialisedSpectra) {
@@ -256,9 +256,8 @@
         normalize(_h_sphericity);
 
         for (size_t N=1; N<7; ++N) {
-          for (int i = 0; i < _h_R_Durham[N-1]->size(); ++i) {
-            _h_R_Durham[N-1]->point(i)->coordinate(1)->
-              setValue(_h_R_Durham[N-1]->point(i)->coordinate(1)->value()/sumOfWeights());
+          for (size_t i = 0; i < _h_R_Durham[N-1]->numPoints(); ++i) {
+            _h_R_Durham[N-1]->point(i).setY(_h_R_Durham[N-1]->point(i).y()/sumOfWeights());
           }
         }
 
@@ -271,9 +270,9 @@
 
       const double avgNumParts = _weightedTotalChargedPartNum / sumOfWeights();
       Scatter2DPtr  mult = bookScatter2D(1, 1, 1);
-      for (int i = 0; i < mult->size(); ++i) {
-        if (fuzzyEquals(sqrtS(), mult->point(i)->coordinate(0)->value(), 0.01)) {
-          mult->point(i)->coordinate(1)->setValue(avgNumParts);
+      for (size_t i = 0; i < mult->numPoints(); ++i) {
+        if (fuzzyEquals(sqrtS(), mult->point(i).x(), 0.01)) {
+          mult->point(i).setY(avgNumParts);
         }
       }
 

Modified: branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc	Tue Jul 19 18:33:53 2011	(r3218)
+++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc	Tue Jul 19 18:39:14 2011	(r3219)
@@ -478,7 +478,7 @@
 
     Histo1DPtr _histScaledMom, _histLogScaledMom;
 
-    AIDA::IProfile1D   *_histPtTOutVsXp, *_histPtVsXp;
+    Profile1DPtr   _histPtTOutVsXp, _histPtVsXp;
 
     Histo1DPtr _hist1MinusT;
     Histo1DPtr _histTMajor;

Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Jul 19 18:33:53 2011	(r3218)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Jul 19 18:39:14 2011	(r3219)
@@ -170,17 +170,17 @@
     JADE_1998_S3612880.cc \
     TASSO_1990_S2148048.cc
 
-# lib_LTLIBRARIES += RivetLEPAnalyses.la
-# RivetLEPAnalyses_la_SOURCES = \
-#     ALEPH_1991_S2435284.cc \
-#     ALEPH_1996_S3486095.cc \
-#     ALEPH_1996_S3196992.cc \
-#     ALEPH_2004_S5765862.cc \
-#     DELPHI_1995_S3137023.cc \
-#     DELPHI_1996_S3430090.cc \
-#     OPAL_1998_S3780481.cc \
-#     OPAL_2001_S4553896.cc \
-#     OPAL_2004_S6132243.cc
+lib_LTLIBRARIES += RivetLEPAnalyses.la
+RivetLEPAnalyses_la_SOURCES = \
+    ALEPH_1991_S2435284.cc \
+    ALEPH_1996_S3486095.cc \
+    ALEPH_1996_S3196992.cc \
+    ALEPH_2004_S5765862.cc \
+    DELPHI_1995_S3137023.cc \
+    DELPHI_1996_S3430090.cc \
+    OPAL_1998_S3780481.cc \
+    OPAL_2001_S4553896.cc \
+    OPAL_2004_S6132243.cc
 # if ENABLE_PRELIMINARY
 # RivetLEPAnalyses_la_SOURCES += \
 #     DELPHI_2002_069_CONF_603.cc