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

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Tue Jul 19 18:48:12 2011
New Revision: 3220

Log:
remaining LEP

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

Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Jul 19 18:39:14 2011	(r3219)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Jul 19 18:48:12 2011	(r3220)
@@ -181,15 +181,15 @@
     OPAL_1998_S3780481.cc \
     OPAL_2001_S4553896.cc \
     OPAL_2004_S6132243.cc
-# if ENABLE_PRELIMINARY
-# RivetLEPAnalyses_la_SOURCES += \
-#     DELPHI_2002_069_CONF_603.cc
-# endif
-# if ENABLE_UNVALIDATED
-# RivetLEPAnalyses_la_SOURCES += \
-#     DELPHI_2003_WUD_03_11.cc \
-#     OPAL_1993_S2692198.cc
-# endif
+if ENABLE_PRELIMINARY
+RivetLEPAnalyses_la_SOURCES += \
+    DELPHI_2002_069_CONF_603.cc
+endif
+if ENABLE_UNVALIDATED
+RivetLEPAnalyses_la_SOURCES += \
+    DELPHI_2003_WUD_03_11.cc \
+    OPAL_1993_S2692198.cc
+endif
 
 
 lib_LTLIBRARIES += RivetRHICAnalyses.la

Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc	Tue Jul 19 18:39:14 2011	(r3219)
+++ branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc	Tue Jul 19 18:48:12 2011	(r3220)
@@ -86,9 +86,9 @@
 	// run the jet clustering DURHAM
 	fastjet::ClusterSequence clust_seq(input_particles, durham_def);
 	// cluster the jets
-	for (int j = 0; j < _nPhotonDurham->size(); ++j) {
+	for (size_t j = 0; j < _nPhotonDurham->numPoints(); ++j) {
 	  bool accept(true);
-	  double ycut = _nPhotonDurham->point(j)->coordinate(0)->value();
+	  double ycut = _nPhotonDurham->point(j).x();
 	  double dcut = sqr(evis)*ycut;
 	  vector<fastjet::PseudoJet> exclusive_jets = 
 	    sorted_by_E(clust_seq.exclusive_jets(dcut));
@@ -103,19 +103,17 @@
 	    }
 	  }
 	  if(!accept) continue;
-	  _nPhotonDurham->point(j)->coordinate(1)->
-	    setValue(_nPhotonDurham->point(j)->coordinate(1)->value()+weight);
+	  _nPhotonDurham->point(j).setY(_nPhotonDurham->point(j).y()+weight);
 	  int njet = min(4,int(exclusive_jets.size())) - 1;
-	  if(j<_nPhotonJetDurham[njet]->size()) {
-	    _nPhotonJetDurham[njet]->point(j)->coordinate(1)->
-	      setValue(_nPhotonJetDurham[njet]->point(j)->coordinate(1)->value()+weight);
+	  if(j<_nPhotonJetDurham[njet]->numPoints()) {
+	    _nPhotonJetDurham[njet]->point(j).setY(_nPhotonJetDurham[njet]->point(j).y()+weight);
 	  }
 	}
 	// run the jet clustering JADE
 	fastjet::ClusterSequence clust_seq2(input_particles, jade_def);
-	for (int j = 0; j < _nPhotonJade->size(); ++j) {
+	for (size_t j = 0; j < _nPhotonJade->numPoints(); ++j) {
 	  bool accept(true);
-	  double ycut = _nPhotonJade->point(j)->coordinate(0)->value();
+	  double ycut = _nPhotonJade->point(j).x();
 	  double dcut = sqr(evis)*ycut;
 	  vector<fastjet::PseudoJet> exclusive_jets = 
 	    sorted_by_E(clust_seq2.exclusive_jets(dcut));
@@ -129,12 +127,10 @@
 	    }
 	  }
 	  if(!accept) continue;
-	  _nPhotonJade->point(j)->coordinate(1)->
-	    setValue(_nPhotonJade->point(j)->coordinate(1)->value()+weight);
+	  _nPhotonJade->point(j).setY(_nPhotonJade->point(j).y()+weight);
 	  int njet = min(4,int(exclusive_jets.size())) - 1;
-	  if(j<_nPhotonJetJade[njet]->size()) {
-	    _nPhotonJetJade[njet]->point(j)->coordinate(1)->
-	      setValue(_nPhotonJetJade[njet]->point(j)->coordinate(1)->value()+weight);
+	  if(j<_nPhotonJetJade[njet]->numPoints()) {
+	    _nPhotonJetJade[njet]->point(j).setY(_nPhotonJetJade[njet]->point(j).y()+weight);
 	  }
 	}
 	// add this photon back in for the next interation of the loop