[Rivet-svn] r2419 - in trunk: include/Rivet include/Rivet/Analyses include/Rivet/Tools src/Analyses src/Tools

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Mon Apr 26 23:07:18 2010
New Revision: 2419

Log:
Move MC_JetAnalysis into Tools, such that it will actually be available in libRivet and can be used from plugin analyses.

Added:
   trunk/include/Rivet/Tools/MC_JetAnalysis.hh
      - copied unchanged from r2416, trunk/include/Rivet/Analyses/MC_JetAnalysis.hh
   trunk/src/Tools/MC_JetAnalysis.cc
      - copied, changed from r2416, trunk/src/Analyses/MC_JetAnalysis.cc
Deleted:
   trunk/include/Rivet/Analyses/
   trunk/src/Analyses/MC_JetAnalysis.cc
Modified:
   trunk/include/Rivet/Makefile.am
   trunk/src/Analyses/MC_JETS.cc
   trunk/src/Analyses/MC_PHOTONJETS.cc
   trunk/src/Analyses/MC_WJETS.cc
   trunk/src/Analyses/MC_ZJETS.cc
   trunk/src/Analyses/Makefile.am
   trunk/src/Tools/Makefile.am

Modified: trunk/include/Rivet/Makefile.am
==============================================================================
--- trunk/include/Rivet/Makefile.am	Mon Apr 26 22:08:40 2010	(r2418)
+++ trunk/include/Rivet/Makefile.am	Mon Apr 26 23:07:18 2010	(r2419)
@@ -26,8 +26,7 @@
 
 nobase_pkginclude_HEADERS += \
   Config/RivetConfig.hh \
-  Config/BuildOptions.hh \
-  Analyses/MC_JetAnalysis.hh
+  Config/BuildOptions.hh
 
 
 ## Projections
@@ -82,6 +81,7 @@
   Tools/Utils.hh \
   Tools/BinnedHistogram.hh \
   Tools/ParticleIdUtils.hh \
+  Tools/MC_JetAnalysis.hh \
   Tools/TypeTraits.hh
 nobase_dist_noinst_HEADERS += \
   Tools/osdir.hh

Copied: trunk/include/Rivet/Tools/MC_JetAnalysis.hh (from r2416, trunk/include/Rivet/Analyses/MC_JetAnalysis.hh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/include/Rivet/Tools/MC_JetAnalysis.hh	Mon Apr 26 23:07:18 2010	(r2419, copy of r2416, trunk/include/Rivet/Analyses/MC_JetAnalysis.hh)
@@ -0,0 +1,55 @@
+// -*- C++ -*-
+#ifndef RIVET_MC_JetAnalysis_HH
+#define RIVET_MC_JetAnalysis_HH
+
+#include "Rivet/Analysis.hh"
+#include "Rivet/Projections/FinalState.hh"
+
+namespace Rivet {
+
+
+  /// @brief Base class providing common functionality for MC jet validation analyses
+  class MC_JetAnalysis : public Analysis {
+  public:
+
+    /// Default constructor.
+    MC_JetAnalysis(const string& name,
+                   const size_t& njet,
+                   const string& jetpro_name);
+
+
+    /// @name Analysis methods
+    //@{
+    virtual void init();
+    virtual void analyze(const Event& event);
+    virtual void finalize();
+    //@}
+
+
+  protected:
+
+    /// The number of jets for which histograms are to be initialised
+    size_t m_njet;
+
+    /// The name of the jet projection to be used for this analysis
+    /// (this projection has to be registered by the derived analysis!)
+    const std::string m_jetpro_name;
+
+    /// @name Histograms
+    //@{
+    std::vector<AIDA::IHistogram1D *> _h_log10_d;
+    std::vector<AIDA::IDataPointSet *> _h_log10_R;
+    std::vector<AIDA::IHistogram1D *> _h_pT_jet;
+    std::vector<AIDA::IHistogram1D *> _h_eta_jet;
+    std::map<std::pair<size_t, size_t>, AIDA::IHistogram1D*> _h_deta_jets;
+    std::map<std::pair<size_t, size_t>, AIDA::IHistogram1D*> _h_dR_jets;
+    AIDA::IHistogram1D * _h_jet_multi_exclusive;
+    AIDA::IHistogram1D * _h_jet_multi_inclusive;
+    AIDA::IDataPointSet * _h_jet_multi_ratio;
+    //@}
+
+  };
+
+}
+
+#endif

Modified: trunk/src/Analyses/MC_JETS.cc
==============================================================================
--- trunk/src/Analyses/MC_JETS.cc	Mon Apr 26 22:08:40 2010	(r2418)
+++ trunk/src/Analyses/MC_JETS.cc	Mon Apr 26 23:07:18 2010	(r2419)
@@ -2,7 +2,7 @@
 #include "Rivet/Analysis.hh"
 #include "Rivet/RivetAIDA.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/Analyses/MC_JetAnalysis.hh"
+#include "Rivet/Tools/MC_JetAnalysis.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/FastJets.hh"
 

Modified: trunk/src/Analyses/MC_PHOTONJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_PHOTONJETS.cc	Mon Apr 26 22:08:40 2010	(r2418)
+++ trunk/src/Analyses/MC_PHOTONJETS.cc	Mon Apr 26 23:07:18 2010	(r2419)
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-#include "Rivet/Analyses/MC_JetAnalysis.hh"
+#include "Rivet/Tools/MC_JetAnalysis.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/LeadingParticlesFinalState.hh"
 #include "Rivet/Projections/FastJets.hh"

Modified: trunk/src/Analyses/MC_WJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_WJETS.cc	Mon Apr 26 22:08:40 2010	(r2418)
+++ trunk/src/Analyses/MC_WJETS.cc	Mon Apr 26 23:07:18 2010	(r2419)
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-#include "Rivet/Analyses/MC_JetAnalysis.hh"
+#include "Rivet/Tools/MC_JetAnalysis.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/WFinder.hh"
 #include "Rivet/Projections/FastJets.hh"

Modified: trunk/src/Analyses/MC_ZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_ZJETS.cc	Mon Apr 26 22:08:40 2010	(r2418)
+++ trunk/src/Analyses/MC_ZJETS.cc	Mon Apr 26 23:07:18 2010	(r2419)
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-#include "Rivet/Analyses/MC_JetAnalysis.hh"
+#include "Rivet/Tools/MC_JetAnalysis.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/ZFinder.hh"
 #include "Rivet/Projections/FastJets.hh"

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Mon Apr 26 22:08:40 2010	(r2418)
+++ trunk/src/Analyses/Makefile.am	Mon Apr 26 23:07:18 2010	(r2419)
@@ -134,7 +134,6 @@
 lib_LTLIBRARIES += RivetMCAnalyses.la
 RivetMCAnalyses_la_SOURCES = \
     ExampleAnalysis.cc \
-    MC_JetAnalysis.cc \
     MC_JETS.cc \
     MC_PHOTONJETS.cc \
     MC_WJETS.cc \

Copied and modified: trunk/src/Tools/MC_JetAnalysis.cc (from r2416, trunk/src/Analyses/MC_JetAnalysis.cc)
==============================================================================
--- trunk/src/Analyses/MC_JetAnalysis.cc	Mon Apr 26 17:53:00 2010	(r2416, copy source)
+++ trunk/src/Tools/MC_JetAnalysis.cc	Mon Apr 26 23:07:18 2010	(r2419)
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-#include "Rivet/Analyses/MC_JetAnalysis.hh"
+#include "Rivet/Tools/MC_JetAnalysis.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/RivetAIDA.hh"

Modified: trunk/src/Tools/Makefile.am
==============================================================================
--- trunk/src/Tools/Makefile.am	Mon Apr 26 22:08:40 2010	(r2418)
+++ trunk/src/Tools/Makefile.am	Mon Apr 26 23:07:18 2010	(r2419)
@@ -14,6 +14,7 @@
   TinyXML/tinyxml.cpp \
   TinyXML/tinyxmlerror.cpp \
   TinyXML/tinyxmlparser.cpp \
+  MC_JetAnalysis.cc \
   BinnedHistogram.cc
 
 dist_noinst_HEADERS = binreloc.h