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

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Tue Jul 19 17:01:35 2011
New Revision: 3214

Log:
RHIC

Modified:
   branches/2011-07-aida2yoda/src/Analyses/Makefile.am
   branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc
   branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc
   branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc

Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Jul 19 16:58:15 2011	(r3213)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Jul 19 17:01:35 2011	(r3214)
@@ -187,20 +187,20 @@
 # endif
 
 
-# lib_LTLIBRARIES += RivetRHICAnalyses.la
-# RivetRHICAnalyses_la_SOURCES = \
-#     STAR_2006_S6500200.cc \
-#     STAR_2006_S6860818.cc \
-#     STAR_2006_S6870392.cc
-# if ENABLE_PRELIMINARY
-# RivetRHICAnalyses_la_SOURCES += \
-#     STAR_2009_UE_HELEN.cc
-# endif
-# if ENABLE_UNVALIDATED
-# RivetRHICAnalyses_la_SOURCES += \
-#     STAR_2008_S7869363.cc \
-#     STAR_2008_S7993412.cc
-# endif
+lib_LTLIBRARIES += RivetRHICAnalyses.la
+RivetRHICAnalyses_la_SOURCES = \
+    STAR_2006_S6500200.cc \
+    STAR_2006_S6860818.cc \
+    STAR_2006_S6870392.cc
+if ENABLE_PRELIMINARY
+RivetRHICAnalyses_la_SOURCES += \
+    STAR_2009_UE_HELEN.cc
+endif
+if ENABLE_UNVALIDATED
+RivetRHICAnalyses_la_SOURCES += \
+    STAR_2008_S7869363.cc \
+    STAR_2008_S7993412.cc
+endif
 
 
 lib_LTLIBRARIES += RivetSPSAnalyses.la

Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc	Tue Jul 19 16:58:15 2011	(r3213)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc	Tue Jul 19 17:01:35 2011	(r3214)
@@ -83,13 +83,14 @@
 
     /// Finalize
     void finalize() {
-      AIDA::IHistogramFactory& hf = histogramFactory();
-      const string dir = histoDir();
-
-      hf.divide(dir + "/d02-x01-y01", *_h_pT_piminus, *_h_pT_piplus);
-      hf.divide(dir + "/d02-x02-y01", *_h_pT_antiproton, *_h_pT_proton);
-      hf.divide(dir + "/d02-x03-y01", *_h_pT_proton, *_h_pT_piplus);
-      hf.divide(dir + "/d02-x04-y01", *_h_pT_antiproton, *_h_pT_piminus);
+      // \todo YODA divide
+      // AIDA::IHistogramFactory& hf = histogramFactory();
+      // const string dir = histoDir();
+
+      // hf.divide(dir + "/d02-x01-y01", *_h_pT_piminus, *_h_pT_piplus);
+      // hf.divide(dir + "/d02-x02-y01", *_h_pT_antiproton, *_h_pT_proton);
+      // hf.divide(dir + "/d02-x03-y01", *_h_pT_proton, *_h_pT_piplus);
+      // hf.divide(dir + "/d02-x04-y01", *_h_pT_antiproton, *_h_pT_piminus);
 
       scale(_h_pT_piplus,     1./(2*M_PI*_sumWeightSelected));
       scale(_h_pT_piminus,    1./(2*M_PI*_sumWeightSelected));

Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc	Tue Jul 19 16:58:15 2011	(r3213)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc	Tue Jul 19 17:01:35 2011	(r3214)
@@ -160,13 +160,13 @@
           yerr.push_back(y*dy);
         }
       }
-      _h_antibaryon_baryon_ratio->setCoordinate(0, xval, xerr);
-      _h_antibaryon_baryon_ratio->setCoordinate(1, yval, yerr);
+      _h_antibaryon_baryon_ratio.reset( new Scatter2D(xval, yval, xerr, yerr) );
 
-      AIDA::IHistogramFactory& hf = histogramFactory();
-      const string dir = histoDir();
-      hf.divide(dir + "/d02-x02-y01", *_h_pT_lambdabar, *_h_pT_lambda);
-      hf.divide(dir + "/d02-x03-y01", *_h_pT_xiplus, *_h_pT_ximinus);
+      // \todo YODA divide
+      // AIDA::IHistogramFactory& hf = histogramFactory();
+      // const string dir = histoDir();
+      // hf.divide(dir + "/d02-x02-y01", *_h_pT_lambdabar, *_h_pT_lambda);
+      // hf.divide(dir + "/d02-x03-y01", *_h_pT_xiplus, *_h_pT_ximinus);
 
       scale(_h_pT_k0s,       1./(2*M_PI*_sumWeightSelected));
       scale(_h_pT_kminus,    1./(2*M_PI*_sumWeightSelected));

Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc	Tue Jul 19 16:58:15 2011	(r3213)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc	Tue Jul 19 17:01:35 2011	(r3214)
@@ -161,7 +161,7 @@
     Histo1DPtr _h_dpT_Kaon, _h_dpT_Kaonplus;
     Histo1DPtr _h_dpT_AntiProton, _h_dpT_Proton;
 
-    AIDA::IProfile1D   *_h_pT_vs_Nch;
+    Profile1DPtr _h_pT_vs_Nch;
     double nCutsPassed, nPi, nPiPlus, nKaon, nKaonPlus, nProton, nAntiProton;
   };