[Rivet-svn] r1702 - trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Sat Jul 18 13:54:24 2009
New Revision: 1702

Log:
Undoing the change in ExampleAnalysis that was introduced in r1700. I suppose it went into the commit by accident, because it wasn't mentioned in the commit message, and it breaks rivet (libRivetAnalysisStd.so: undefined symbol: _Z22create_ExampleAnalysisv).

Modified:
   trunk/src/Analyses/ExampleAnalysis.cc
   trunk/src/Analyses/StdAnalyses.cc

Modified: trunk/src/Analyses/ExampleAnalysis.cc
==============================================================================
--- trunk/src/Analyses/ExampleAnalysis.cc	Sat Jul 18 13:37:07 2009	(r1701)
+++ trunk/src/Analyses/ExampleAnalysis.cc	Sat Jul 18 13:54:24 2009	(r1702)
@@ -96,9 +96,4 @@
     normalize(_histAplanarity);
   }
 
-
-  // Factory function  
-  Analysis* create_ExampleAnalysis() { return new ExampleAnalysis(); }
-
-
 }

Modified: trunk/src/Analyses/StdAnalyses.cc
==============================================================================
--- trunk/src/Analyses/StdAnalyses.cc	Sat Jul 18 13:37:07 2009	(r1701)
+++ trunk/src/Analyses/StdAnalyses.cc	Sat Jul 18 13:54:24 2009	(r1702)
@@ -4,7 +4,6 @@
 
 // Example analyses
 #include "Rivet/Analyses/ExampleAnalysis.hh"
-Rivet::Analysis* create_ExampleAnalysis();
 #include "Rivet/Analyses/ExampleTree.hh"
 
 // LEP
@@ -73,11 +72,9 @@
   /// by upper-case versions of the analyses' names. (Upper-case 
   /// keys are used since they can be uniquely obtained from any 
   /// mixed-case key, which allows a bit of UI flexibility.)
-
   AnalysisBuilders getAnalysisBuilders() {
     AnalysisBuilders fns;
-    //fns["EXAMPLE"] = Rivet::ExampleAnalysis::create;
-    fns["EXAMPLE"] = create_ExampleAnalysis;
+    fns["EXAMPLE"] = Rivet::ExampleAnalysis::create;
     fns["EXAMPLETREE"] = Rivet::ExampleTree::create;
 
     // LEP