[Rivet-svn] r2274 - in trunk: . plugindemo

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Mon Mar  1 11:52:10 2010
New Revision: 2274

Log:
Bring plugin demo up to date. Also give it a simple standalone Makefile which can also be used by people who use Rivet e.g. from LCG.

Added:
   trunk/plugindemo/Makefile
Deleted:
   trunk/plugindemo/Makefile.am
   trunk/plugindemo/MyTest.cc
Modified:
   trunk/configure.ac
   trunk/plugindemo/   (props changed)
   trunk/plugindemo/MyAnalysis.cc

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Mon Mar  1 10:44:38 2010	(r2273)
+++ trunk/configure.ac	Mon Mar  1 11:52:10 2010	(r2274)
@@ -280,7 +280,6 @@
 AC_CONFIG_FILES(autopackage/default.apspec)
 AC_CONFIG_FILES(autopackage/data.apspec)
 AC_CONFIG_FILES(bin/Makefile bin/rivet-config)
-AC_CONFIG_FILES(plugindemo/Makefile)
 AC_CONFIG_FILES(Makefile Doxyfile)
 
 AC_OUTPUT

Added: trunk/plugindemo/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/plugindemo/Makefile	Mon Mar  1 11:52:10 2010	(r2274)
@@ -0,0 +1,16 @@
+# This expects all Rivet environment variables to be set up correctly already
+# (use the rivetenv.{c}sh script created by the bootstrap script)
+
+shared_flags = -shared -fPIC
+# on Mac OSX you want to use these flags instead:
+#shared_flags = -undefined dynamic_lookup -bundle
+
+RivetMyAnalysis.so: MyAnalysis.cc
+	g++ $(shared_flags) `rivet-config --cppflags` MyAnalysis.cc -o RivetMyAnalysis.so
+
+all: RivetMyAnalysis.so
+
+install: all
+
+clean:
+	rm -f RivetMyAnalysis.so

Modified: trunk/plugindemo/MyAnalysis.cc
==============================================================================
--- trunk/plugindemo/MyAnalysis.cc	Mon Mar  1 10:44:38 2010	(r2273)
+++ trunk/plugindemo/MyAnalysis.cc	Mon Mar  1 11:52:10 2010	(r2274)
@@ -12,10 +12,6 @@
     
     /// Default constructor
     MyAnalysis() : Analysis("MYANALYSIS") {
-      const FinalState cnfs;
-      addProjection(cnfs, "CNFS");
-      const ChargedFinalState cfs;
-      addProjection(cfs, "CFS");
     }
         
     
@@ -64,7 +60,10 @@
     /// @name Analysis methods
     //@{
     void init() { 
-      // No histos, so nothing to do!
+      const FinalState cnfs;
+      addProjection(cnfs, "CNFS");
+      const ChargedFinalState cfs;
+      addProjection(cfs, "CFS");
     }
     
     void analyze(const Event& event) {