[Rivet-svn] r2680 - in trunk: data/anainfo data/plotinfo data/refdata include/Rivet include/Rivet/Projections include/Rivet/Tools src/Analyses src/Projections src/Tools

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Mon Aug 30 12:24:11 BST 2010


Author: fsiegert
Date: Mon Aug 30 12:24:10 2010
New Revision: 2680

Log:
Fix syntax error in .info file.

Modified:
   trunk/data/anainfo/ALEPH_1991_S2435284.info   (props changed)
   trunk/data/anainfo/ALEPH_1996_S3486095.info   (props changed)
   trunk/data/anainfo/CDF_1990_S2089246.info   (props changed)
   trunk/data/anainfo/CDF_1994_S2952106.info   (props changed)
   trunk/data/anainfo/CDF_2000_S4155203.info   (props changed)
   trunk/data/anainfo/CDF_2001_S4751469.info   (props changed)
   trunk/data/anainfo/CDF_2002_S4796047.info   (props changed)
   trunk/data/anainfo/CDF_2004_S5839831.info   (props changed)
   trunk/data/anainfo/CDF_2005_S6217184.info   (props changed)
   trunk/data/anainfo/CDF_2006_S6653332.info   (props changed)
   trunk/data/anainfo/CDF_2007_S7057202.info   (props changed)
   trunk/data/anainfo/CDF_2008_LEADINGJETS.info   (props changed)
   trunk/data/anainfo/CDF_2008_NOTE_9351.info   (props changed)
   trunk/data/anainfo/CDF_2008_S7540469.info   (props changed)
   trunk/data/anainfo/CDF_2008_S7541902.info   (props changed)
   trunk/data/anainfo/CDF_2008_S7782535.info   (props changed)
   trunk/data/anainfo/CDF_2008_S7828950.info   (props changed)
   trunk/data/anainfo/CDF_2008_S8093652.info   (props changed)
   trunk/data/anainfo/CDF_2008_S8095620.info   (props changed)
   trunk/data/anainfo/CDF_2009_S8233977.info   (props changed)
   trunk/data/anainfo/D0_2001_S4674421.info   (props changed)
   trunk/data/anainfo/D0_2004_S5992206.info   (props changed)
   trunk/data/anainfo/D0_2006_S6438750.info   (props changed)
   trunk/data/anainfo/D0_2007_S7075677.info   (props changed)
   trunk/data/anainfo/D0_2008_S6879055.info   (props changed)
   trunk/data/anainfo/D0_2008_S7554427.info   (props changed)
   trunk/data/anainfo/D0_2008_S7662670.info   (props changed)
   trunk/data/anainfo/D0_2008_S7719523.info   (props changed)
   trunk/data/anainfo/D0_2008_S7837160.info   (props changed)
   trunk/data/anainfo/D0_2008_S7863608.info   (props changed)
   trunk/data/anainfo/D0_2009_S8202443.info   (props changed)
   trunk/data/anainfo/D0_2009_S8320160.info   (props changed)
   trunk/data/anainfo/DELPHI_1995_S3137023.info   (props changed)
   trunk/data/anainfo/DELPHI_1996_S3430090.info   (props changed)
   trunk/data/anainfo/DELPHI_2002_069_CONF_603.info   (props changed)
   trunk/data/anainfo/DELPHI_2003_WUD_03_11.info   (props changed)
   trunk/data/anainfo/EXAMPLE.info   (props changed)
   trunk/data/anainfo/EXAMPLETREE.info   (props changed)
   trunk/data/anainfo/H1_1994_S2919893.info   (props changed)
   trunk/data/anainfo/H1_1995_S3167097.info   (props changed)
   trunk/data/anainfo/H1_2000_S4129130.info   (props changed)
   trunk/data/anainfo/JADE_OPAL_2000_S4300807.info   (props changed)
   trunk/data/anainfo/MC_HJETS.info   (props changed)
   trunk/data/anainfo/MC_LEADINGJETS.info   (props changed)
   trunk/data/anainfo/MC_PHOTONJETS.info   (props changed)
   trunk/data/anainfo/MC_WJETS.info   (props changed)
   trunk/data/anainfo/MC_ZJETS.info   (props changed)
   trunk/data/anainfo/OPAL_1993_S2692198.info   (contents, props changed)
   trunk/data/anainfo/OPAL_1998_S3780481.info   (props changed)
   trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info   (props changed)
   trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info   (props changed)
   trunk/data/anainfo/STAR_2006_S6870392.info   (props changed)
   trunk/data/anainfo/STAR_2008_S7993412.info   (props changed)
   trunk/data/anainfo/ZEUS_2001_S4815815.info   (props changed)
   trunk/data/plotinfo/MC_PHOTONJETS.plot   (props changed)
   trunk/data/plotinfo/MC_SUSY.plot   (props changed)
   trunk/data/plotinfo/OPAL_1993_S2692198.plot   (props changed)
   trunk/data/refdata/   (props changed)
   trunk/data/refdata/UA1_1990_S2044935.aida   (props changed)
   trunk/include/Rivet/ProjectionHandler.hh
   trunk/include/Rivet/Projections/IdentifiedFinalState.hh   (props changed)
   trunk/include/Rivet/Projections/TriggerCDFRun0Run1.hh   (props changed)
   trunk/include/Rivet/Projections/TriggerUA5.hh   (props changed)
   trunk/include/Rivet/Projections/VisibleFinalState.hh   (props changed)
   trunk/include/Rivet/Tools/ParticleIdUtils.hh   (props changed)
   trunk/src/Analyses/ALEPH_1991_S2435284.cc   (props changed)
   trunk/src/Analyses/ALEPH_1996_S3486095.cc   (props changed)
   trunk/src/Analyses/CDF_1988_S1865951.cc   (props changed)
   trunk/src/Analyses/CDF_1990_S2089246.cc   (props changed)
   trunk/src/Analyses/CDF_1994_S2952106.cc   (props changed)
   trunk/src/Analyses/CDF_2000_S4155203.cc   (props changed)
   trunk/src/Analyses/CDF_2001_S4751469.cc   (props changed)
   trunk/src/Analyses/CDF_2002_S4796047.cc   (props changed)
   trunk/src/Analyses/CDF_2004_S5839831.cc   (props changed)
   trunk/src/Analyses/CDF_2005_S6080774.cc   (props changed)
   trunk/src/Analyses/CDF_2005_S6217184.cc   (props changed)
   trunk/src/Analyses/CDF_2006_S6450792.cc   (props changed)
   trunk/src/Analyses/CDF_2006_S6653332.cc   (props changed)
   trunk/src/Analyses/CDF_2007_S7057202.cc   (props changed)
   trunk/src/Analyses/CDF_2008_LEADINGJETS.cc   (props changed)
   trunk/src/Analyses/CDF_2008_NOTE_9351.cc   (props changed)
   trunk/src/Analyses/CDF_2008_S7540469.cc   (props changed)
   trunk/src/Analyses/CDF_2008_S7541902.cc   (props changed)
   trunk/src/Analyses/CDF_2008_S7782535.cc   (props changed)
   trunk/src/Analyses/CDF_2008_S7828950.cc   (props changed)
   trunk/src/Analyses/CDF_2008_S8093652.cc   (props changed)
   trunk/src/Analyses/CDF_2008_S8095620.cc   (props changed)
   trunk/src/Analyses/CDF_2009_S8057893.cc   (props changed)
   trunk/src/Analyses/CDF_2009_S8233977.cc   (props changed)
   trunk/src/Analyses/D0_1996_S3214044.cc   (props changed)
   trunk/src/Analyses/D0_1996_S3324664.cc   (props changed)
   trunk/src/Analyses/D0_2001_S4674421.cc   (props changed)
   trunk/src/Analyses/D0_2004_S5992206.cc   (props changed)
   trunk/src/Analyses/D0_2006_S6438750.cc   (props changed)
   trunk/src/Analyses/D0_2007_S7075677.cc   (props changed)
   trunk/src/Analyses/D0_2008_S6879055.cc   (props changed)
   trunk/src/Analyses/D0_2008_S7554427.cc   (props changed)
   trunk/src/Analyses/D0_2008_S7662670.cc   (props changed)
   trunk/src/Analyses/D0_2008_S7719523.cc   (props changed)
   trunk/src/Analyses/D0_2008_S7837160.cc   (props changed)
   trunk/src/Analyses/D0_2008_S7863608.cc   (props changed)
   trunk/src/Analyses/D0_2009_S8202443.cc   (props changed)
   trunk/src/Analyses/D0_2009_S8320160.cc   (props changed)
   trunk/src/Analyses/D0_2009_S8349509.cc   (props changed)
   trunk/src/Analyses/DELPHI_1995_S3137023.cc   (props changed)
   trunk/src/Analyses/DELPHI_1996_S3430090.cc   (props changed)
   trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc   (props changed)
   trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc   (props changed)
   trunk/src/Analyses/E735_1998_S3905616.cc   (props changed)
   trunk/src/Analyses/ExampleAnalysis.cc   (props changed)
   trunk/src/Analyses/H1_1994_S2919893.cc   (props changed)
   trunk/src/Analyses/H1_1995_S3167097.cc   (props changed)
   trunk/src/Analyses/H1_2000_S4129130.cc   (props changed)
   trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc   (props changed)
   trunk/src/Analyses/MC_DIJET.cc   (props changed)
   trunk/src/Analyses/MC_HJETS.cc   (props changed)
   trunk/src/Analyses/MC_JetAnalysis.cc   (props changed)
   trunk/src/Analyses/MC_LEADINGJETS.cc   (props changed)
   trunk/src/Analyses/MC_PHOTONJETS.cc   (props changed)
   trunk/src/Analyses/MC_SUSY.cc   (props changed)
   trunk/src/Analyses/MC_WJETS.cc   (props changed)
   trunk/src/Analyses/MC_ZJETS.cc   (props changed)
   trunk/src/Analyses/OPAL_1993_S2692198.cc   (props changed)
   trunk/src/Analyses/OPAL_1998_S3780481.cc   (props changed)
   trunk/src/Analyses/OPAL_2004_S6132243.cc   (props changed)
   trunk/src/Analyses/PDG_Hadron_Multiplicities.cc   (props changed)
   trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc   (props changed)
   trunk/src/Analyses/SFM_1984_S1178091.cc   (props changed)
   trunk/src/Analyses/STAR_2006_S6870392.cc   (props changed)
   trunk/src/Analyses/STAR_2008_S7993412.cc   (props changed)
   trunk/src/Analyses/STAR_2009_UE_HELEN.cc   (props changed)
   trunk/src/Analyses/UA1_1990_S2044935.cc   (props changed)
   trunk/src/Analyses/UA5_1982_S875503.cc   (props changed)
   trunk/src/Analyses/UA5_1986_S1583476.cc   (props changed)
   trunk/src/Analyses/UA5_1988_S1867512.cc   (props changed)
   trunk/src/Analyses/UA5_1989_S1926373.cc   (props changed)
   trunk/src/Analyses/ZEUS_2001_S4815815.cc   (props changed)
   trunk/src/Projections/IdentifiedFinalState.cc   (props changed)
   trunk/src/Projections/TriggerCDFRun0Run1.cc   (props changed)
   trunk/src/Projections/TriggerUA5.cc   (props changed)
   trunk/src/Projections/VisibleFinalState.cc   (props changed)
   trunk/src/Tools/ParticleIdUtils.cc   (props changed)

Modified: trunk/data/anainfo/OPAL_1993_S2692198.info
==============================================================================
--- trunk/data/anainfo/OPAL_1993_S2692198.info	Wed Aug 25 15:45:53 2010	(r2679)
+++ trunk/data/anainfo/OPAL_1993_S2692198.info	Mon Aug 30 12:24:10 2010	(r2680)
@@ -10,7 +10,6 @@
 References:
  - Z.Phys.C58:405-418,1993
  - doi:10.1007/BF01557697
- - 
 RunInfo:
   $e^+ e^- \to$ jet jet (+ photons)
 NumEvents: 1000000

Modified: trunk/include/Rivet/ProjectionHandler.hh
==============================================================================
--- trunk/include/Rivet/ProjectionHandler.hh	Wed Aug 25 15:45:53 2010	(r2679)
+++ trunk/include/Rivet/ProjectionHandler.hh	Mon Aug 30 12:24:10 2010	(r2680)
@@ -14,14 +14,6 @@
   /// Typedef for Projection (smart) pointer
   typedef shared_ptr<const Projection> ProjHandle;
 
-  // Needed to make smart pointers compare equivalent in the STL set
-  struct ProjHandleLess {
-    bool operator()(const ProjHandle& a, const ProjHandle& b) {
-      return a.get() < b.get();
-    }
-  };
-
-
   // Forward declaration.
   class ProjectionApplier;
 
@@ -54,7 +46,7 @@
     friend class ProjectionApplier;
 
     /// Typedef for a vector of Projection pointers.
-    typedef set<ProjHandle, ProjHandleLess> ProjHandles;
+    typedef set<ProjHandle> ProjHandles;
 
     /// @brief Typedef for the structure used to contain named projections for a
     /// particular containing Analysis or Projection.


More information about the Rivet-svn mailing list