|
|
[Rivet-svn] r1796 - in trunk: doc include/Rivet include/Rivet/Projections src src/Analyses src/Analyses/CDF src/Analyses/D0 src/Analyses/MC src/Analyses/RHIC src/Projections
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Mon Aug 31 22:18:24 BST 2009
Author: buckley
Date: Mon Aug 31 22:18:24 2009
New Revision: 1796
Log:
Cosmetic code updates added while trying to solve the overwritten projection mystery
Modified:
trunk/doc/mk-analysis-html
trunk/include/Rivet/Projections/ChargedFinalState.hh
trunk/include/Rivet/Projections/FinalState.hh
trunk/include/Rivet/Projections/HadronicFinalState.hh
trunk/include/Rivet/Projections/IdentifiedFinalState.hh
trunk/include/Rivet/Projections/InitialQuarks.hh
trunk/include/Rivet/Projections/LeadingParticlesFinalState.hh
trunk/include/Rivet/Projections/LossyFinalState.hh
trunk/include/Rivet/Projections/UnstableFinalState.hh
trunk/include/Rivet/Projections/VisibleFinalState.hh
trunk/include/Rivet/Rivet.hh
trunk/src/Analyses/CDF/CDF_2008_S7540469.cc
trunk/src/Analyses/D0/D0_2001_S4674421.cc
trunk/src/Analyses/D0/D0_2006_S6438750.cc
trunk/src/Analyses/D0/D0_2008_S6879055.cc
trunk/src/Analyses/D0/D0_2008_S7554427.cc
trunk/src/Analyses/D0/D0_2008_S7662670.cc
trunk/src/Analyses/D0/D0_2008_S7719523.cc
trunk/src/Analyses/MC/MC_LHC_ZANALYSIS.cc
trunk/src/Analyses/MC/MC_TVT1960_PHOTONJETS.cc
trunk/src/Analyses/Makefile.am
trunk/src/Analyses/RHIC/STAR_2006_S6870392.cc
trunk/src/Analyses/RHIC/STAR_2008_S7993412.cc
trunk/src/AnalysisLoader.cc
trunk/src/ProjectionHandler.cc
trunk/src/Projections/FinalState.cc
Modified: trunk/doc/mk-analysis-html
==============================================================================
--- trunk/doc/mk-analysis-html Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/doc/mk-analysis-html Mon Aug 31 22:18:24 2009 (r1796)
@@ -32,7 +32,7 @@
os.environ["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"] + ":" + \
os.path.abspath(os.path.join(os.getcwd(), "..", "src", ".libs"))
anadirs = glob.glob(os.path.join(os.getcwd(), "..", "src", "Analyses", "*", ".libs"))
-print anadirs
+#print anadirs
os.environ["RIVET_ANALYSIS_PATH"] = ":".join(anadirs)
Modified: trunk/include/Rivet/Projections/ChargedFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/ChargedFinalState.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/ChargedFinalState.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -25,8 +25,8 @@
addProjection(fsp, "FS");
}
- ChargedFinalState(double mineta = -MaxRapidity,
- double maxeta = MaxRapidity,
+ ChargedFinalState(double mineta = -MAXRAPIDITY,
+ double maxeta = MAXRAPIDITY,
double minpt = 0.0*GeV)
{
setName("ChargedFinalState");
Modified: trunk/include/Rivet/Projections/FinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/FinalState.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/FinalState.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -9,23 +9,23 @@
namespace Rivet {
+
/// Project out all final-state particles in an event.
- class FinalState: public Projection {
-
+ class FinalState : public Projection {
public:
/// @name Standard constructors and destructors.
//@{
/// The default constructor. May specify the minimum and maximum
/// pseudorapidity \f$ \eta \f$ and the min \f$ p_T \f$ (in GeV).
- FinalState(double mineta = -MaxRapidity,
- double maxeta = MaxRapidity,
+ FinalState(double mineta = -MAXRAPIDITY,
+ double maxeta = MAXRAPIDITY,
double minpt = 0.0*GeV);
/// A constructor which allows to specify multiple eta ranges
/// and the min \f$ p_T \f$ (in GeV).
- FinalState(const std::vector<std::pair<double, double> >& etaRanges,
- double minpt = 0.0*GeV);
+ FinalState(const vector<pair<double, double> >& etaRanges,
+ double minpt = 0.0*GeV);
/// Clone on the heap.
virtual const Projection* clone() const {
@@ -42,7 +42,7 @@
virtual const size_t size() const { return _theParticles.size(); }
/// Is this final state empty?
- virtual const bool isEmpty() const { return _theParticles.empty(); }
+ virtual const bool empty() const { return _theParticles.empty(); }
public:
@@ -71,7 +71,7 @@
protected:
/// The ranges allowed for pseudorapidity.
- std::vector<std::pair<double,double> > _etaRanges;
+ vector<pair<double,double> > _etaRanges;
/// The minimum allowed transverse momentum.
double _ptmin;
@@ -80,8 +80,8 @@
ParticleVector _theParticles;
};
+
}
-
#endif
Modified: trunk/include/Rivet/Projections/HadronicFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/HadronicFinalState.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/HadronicFinalState.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -25,8 +25,8 @@
addProjection(fsp, "FS");
}
- HadronicFinalState(double mineta = -MaxRapidity,
- double maxeta = MaxRapidity,
+ HadronicFinalState(double mineta = -MAXRAPIDITY,
+ double maxeta = MAXRAPIDITY,
double minpt = 0.0*GeV)
: FinalState(mineta, maxeta, minpt)
{
Modified: trunk/include/Rivet/Projections/IdentifiedFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/IdentifiedFinalState.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/IdentifiedFinalState.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -20,7 +20,7 @@
/// @name Constructors
//@{
/// Default constructor.
- IdentifiedFinalState(double etamin=-MaxRapidity, double etamax=MaxRapidity, double ptMin=0.0*GeV)
+ IdentifiedFinalState(double etamin=-MAXRAPIDITY, double etamax=MAXRAPIDITY, double ptMin=0.0*GeV)
: FinalState(etamin, etamax, ptMin)
{
setName("IdentifiedFinalState");
Modified: trunk/include/Rivet/Projections/InitialQuarks.hh
==============================================================================
--- trunk/include/Rivet/Projections/InitialQuarks.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/InitialQuarks.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -34,7 +34,7 @@
virtual const ParticleVector& particles() const { return _theParticles; }
/// Is this final state empty?
- virtual const bool isEmpty() const { return _theParticles.empty(); }
+ virtual const bool empty() const { return _theParticles.empty(); }
protected:
Modified: trunk/include/Rivet/Projections/LeadingParticlesFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/LeadingParticlesFinalState.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/LeadingParticlesFinalState.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -17,7 +17,7 @@
/// Constructor: the supplied FinalState projection is assumed to live through the run.
/// @todo Why specify the rap & pT cuts again?
- LeadingParticlesFinalState(FinalState & fsp, double mineta = -MaxRapidity, double maxeta = MaxRapidity, double minpt = 0.0 * GeV)
+ LeadingParticlesFinalState(FinalState & fsp, double mineta = -MAXRAPIDITY, double maxeta = MAXRAPIDITY, double minpt = 0.0 * GeV)
: FinalState(mineta, maxeta, minpt) {
setName("LeadingParticlesFinalState");
addProjection(fsp, "FS");
Modified: trunk/include/Rivet/Projections/LossyFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/LossyFinalState.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/LossyFinalState.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -32,8 +32,8 @@
/// Stand-alone constructor. Initialises the base FinalState projection.
LossyFinalState(double lossfraction,
- double mineta = -MaxRapidity,
- double maxeta = MaxRapidity,
+ double mineta = -MAXRAPIDITY,
+ double maxeta = MAXRAPIDITY,
double minpt = 0.0)
: _lossFraction(lossfraction)
{
Modified: trunk/include/Rivet/Projections/UnstableFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/UnstableFinalState.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/UnstableFinalState.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -18,8 +18,8 @@
//@{
/// The default constructor. May specify the minimum and maximum
/// pseudorapidity \f$ \eta \f$ and the min \f$ p_T \f$ (in GeV).
- UnstableFinalState(double mineta = -MaxRapidity,
- double maxeta = MaxRapidity,
+ UnstableFinalState(double mineta = -MAXRAPIDITY,
+ double maxeta = MAXRAPIDITY,
double minpt = 0.0*GeV)
: _etamin(mineta), _etamax(maxeta), _ptmin(minpt)
{
@@ -40,7 +40,7 @@
virtual const ParticleVector& particles() const { return _theParticles; }
/// Is this final state empty?
- virtual const bool isEmpty() const { return _theParticles.empty(); }
+ virtual const bool empty() const { return _theParticles.empty(); }
protected:
Modified: trunk/include/Rivet/Projections/VisibleFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/VisibleFinalState.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Projections/VisibleFinalState.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -30,8 +30,8 @@
/// Constructor with min and max pseudorapidity \f$ \eta \f$ and min \f$ p_T
/// \f$ (in GeV).
- VisibleFinalState(double mineta = -MaxRapidity,
- double maxeta = MaxRapidity,
+ VisibleFinalState(double mineta = -MAXRAPIDITY,
+ double maxeta = MAXRAPIDITY,
double minpt = 0.0*GeV) {
setName("VisibleFinalState");
VetoedFinalState vfs(FinalState(mineta, maxeta, minpt));
Modified: trunk/include/Rivet/Rivet.hh
==============================================================================
--- trunk/include/Rivet/Rivet.hh Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/include/Rivet/Rivet.hh Mon Aug 31 22:18:24 2009 (r1796)
@@ -47,7 +47,7 @@
using std::endl;
/// A sensible default maximum value of rapidity for Rivet analyses to use.
- static const double MaxRapidity = 100000.0;
+ static const double MAXRAPIDITY = 100000.0;
/// A function to get the Rivet version string
string version();
Modified: trunk/src/Analyses/CDF/CDF_2008_S7540469.cc
==============================================================================
--- trunk/src/Analyses/CDF/CDF_2008_S7540469.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/CDF/CDF_2008_S7540469.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -50,7 +50,7 @@
// Skip if the event is empty
const FinalState& fs = applyProjection<FinalState>(event, "FS");
- if (fs.isEmpty()) {
+ if (fs.empty()) {
getLog() << Log::DEBUG << "Skipping event " << event.genEvent().event_number()
<< " because no final state pair found " << endl;
vetoEvent;
Modified: trunk/src/Analyses/D0/D0_2001_S4674421.cc
==============================================================================
--- trunk/src/Analyses/D0/D0_2001_S4674421.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/D0/D0_2001_S4674421.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -101,9 +101,9 @@
// Fill W pT distributions
ParticleVector Wdaughters;
- if (enuFS.particles().size() == 2 && enubFS.isEmpty()) {
+ if (enuFS.particles().size() == 2 && enubFS.empty()) {
Wdaughters = enuFS.particles();
- } else if (enuFS.isEmpty() && enubFS.particles().size() == 2) {
+ } else if (enuFS.empty() && enubFS.particles().size() == 2) {
Wdaughters = enubFS.particles();
}
if (! Wdaughters.empty()) {
Modified: trunk/src/Analyses/D0/D0_2006_S6438750.cc
==============================================================================
--- trunk/src/Analyses/D0/D0_2006_S6438750.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/D0/D0_2006_S6438750.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -66,7 +66,7 @@
// Get all other particles
const FinalState& fs = applyProjection<FinalState>(event, "AllFS");
- if (fs.isEmpty()) {
+ if (fs.empty()) {
vetoEvent;
}
Modified: trunk/src/Analyses/D0/D0_2008_S6879055.cc
==============================================================================
--- trunk/src/Analyses/D0/D0_2008_S6879055.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/D0/D0_2008_S6879055.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -71,7 +71,7 @@
// Skip if the event is empty
const FinalState& fs = applyProjection<FinalState>(event, "FS");
- if (fs.isEmpty()) {
+ if (fs.empty()) {
vetoEvent;
}
Modified: trunk/src/Analyses/D0/D0_2008_S7554427.cc
==============================================================================
--- trunk/src/Analyses/D0/D0_2008_S7554427.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/D0/D0_2008_S7554427.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -23,7 +23,7 @@
// Run II Z pT
setBeams(PROTON, ANTIPROTON);
- ZFinder zfinder(-MaxRapidity, MaxRapidity, 0.0*GeV, ELECTRON,
+ ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
40.0*GeV, 200.0*GeV, 0.2);
addProjection(zfinder, "ZFinder");
}
Modified: trunk/src/Analyses/D0/D0_2008_S7662670.cc
==============================================================================
--- trunk/src/Analyses/D0/D0_2008_S7662670.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/D0/D0_2008_S7662670.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -60,7 +60,7 @@
// Skip if the event is empty
const FinalState& fs = applyProjection<FinalState>(event, "FS");
- if (fs.isEmpty()) {
+ if (fs.empty()) {
getLog() << Log::DEBUG << "Empty event!" << endl;
vetoEvent;
}
Modified: trunk/src/Analyses/D0/D0_2008_S7719523.cc
==============================================================================
--- trunk/src/Analyses/D0/D0_2008_S7719523.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/D0/D0_2008_S7719523.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -79,7 +79,7 @@
// Get all charged particles
const FinalState& fs = applyProjection<FinalState>(event, "JetFS");
- if (fs.isEmpty()) {
+ if (fs.empty()) {
vetoEvent;
}
Modified: trunk/src/Analyses/MC/MC_LHC_ZANALYSIS.cc
==============================================================================
--- trunk/src/Analyses/MC/MC_LHC_ZANALYSIS.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/MC/MC_LHC_ZANALYSIS.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -17,7 +17,7 @@
: Analysis("MC_LHC_ZANALYSIS") {
const ChargedFinalState cfs;
addProjection(cfs, "CFS");
- const ZFinder zf(-MaxRapidity, MaxRapidity, 0.0*GeV, ELECTRON, 30.0*GeV, 115.0*GeV, 0.2);
+ const ZFinder zf(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON, 30.0*GeV, 115.0*GeV, 0.2);
addProjection(zf, "ZF");
FastJets fastjets(zf.remainingFinalState(), FastJets::KT, 0.7);
addProjection(fastjets, "Jets");
Modified: trunk/src/Analyses/MC/MC_TVT1960_PHOTONJETS.cc
==============================================================================
--- trunk/src/Analyses/MC/MC_TVT1960_PHOTONJETS.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/MC/MC_TVT1960_PHOTONJETS.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -66,7 +66,7 @@
// Get all charged particles
const FinalState& fs = applyProjection<FinalState>(e, "JetFS");
- if (fs.isEmpty()) {
+ if (fs.empty()) {
vetoEvent;
}
Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/Makefile.am Mon Aug 31 22:18:24 2009 (r1796)
@@ -1,4 +1,5 @@
-SUBDIRS = CDF D0 SPS LEP HERA RHIC Example MC Misc
+SUBDIRS = Example RHIC
+# CDF D0 SPS LEP HERA RHIC MC Misc
## Flags for building all plugins
AM_LDFLAGS = $(LDFLAGS) -module -L$(FASTJETLIBPATH)
Modified: trunk/src/Analyses/RHIC/STAR_2006_S6870392.cc
==============================================================================
--- trunk/src/Analyses/RHIC/STAR_2006_S6870392.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/RHIC/STAR_2006_S6870392.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -19,6 +19,7 @@
FinalState fs(-2.0, 2.0);
addProjection(fs, "FS");
// R=0.4, pTmin=0, seed_threshold=0.5:
+ /// @todo Presumably this jet alg is wrong...
addProjection(FastJets(fs, FastJets::CDFMIDPOINT, 0.4, 0.0, 0.5), "MidpointJets");
}
@@ -38,7 +39,7 @@
// Skip if the event is empty
const FinalState& fs = applyProjection<FinalState>(event, "FS");
- if (fs.isEmpty()) {
+ if (fs.empty()) {
getLog() << Log::DEBUG << "Skipping event " << event.genEvent().event_number()
<< " because no final state found " << endl;
vetoEvent;
Modified: trunk/src/Analyses/RHIC/STAR_2008_S7993412.cc
==============================================================================
--- trunk/src/Analyses/RHIC/STAR_2008_S7993412.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Analyses/RHIC/STAR_2008_S7993412.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -16,7 +16,7 @@
setBeams(PROTON, PROTON);
ChargedFinalState fs(-1.0, 1.0, 1.0*GeV);
addProjection(fs, "FS");
- }
+ }
/// @name Analysis methods
@@ -35,7 +35,7 @@
// Skip if the event is empty
const FinalState& fs = applyProjection<FinalState>(event, "FS");
- if (fs.isEmpty()) {
+ if (fs.empty()) {
getLog() << Log::DEBUG << "Skipping event " << event.genEvent().event_number()
<< " because no final state found " << endl;
vetoEvent;
Modified: trunk/src/AnalysisLoader.cc
==============================================================================
--- trunk/src/AnalysisLoader.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/AnalysisLoader.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -45,10 +45,10 @@
if (_ptrs.find(name) != _ptrs.end()) {
// Protect against overwriting analyses by throwing an error
/// @todo Tidy this up!
- Log::getLog("Rivet.Loader") << Log::ERROR << "Tried to register a second plugin analysis called '" << name << "'" << endl;
+ Log::getLog("Rivet.AnalysisLoader") << Log::ERROR << "Tried to register a second plugin analysis called '" << name << "'" << endl;
exit(1);
}
- Log::getLog("Rivet.Loader") << Log::TRACE << "Registering a plugin analysis called '" << name << "'" << endl;
+ Log::getLog("Rivet.AnalysisLoader") << Log::TRACE << "Registering a plugin analysis called '" << name << "'" << endl;
_ptrs[name] = ab;
}
@@ -84,36 +84,32 @@
oslink::directory dir(d);
while (dir) {
string filename = dir.next();
- /// Require that name *starts* with 'Rivet' with new loader
+ // Require that name *starts* with 'Rivet' with new loader
if (filename.find("Rivet") != 0) continue;
size_t posn = filename.find(libsuffix);
if (posn == string::npos || posn != filename.length()-libsuffix.length()) continue;
/// @todo Make sure this is an abs path
/// @todo Sys-dependent path separator instead of "/"
- pluginfiles += d + "/" + filename;
+ const string path = d + "/" + filename;
+ // Ensure no duplicate paths
+ if (find(pluginfiles.begin(), pluginfiles.end(), path) == pluginfiles.end()) {
+ pluginfiles += path;
+ }
}
}
// Load the plugin files
+ Log::getLog("Rivet.AnalysisLoader") << Log::TRACE << "Candidate analysis plugin libs: " << pluginfiles << endl;
foreach (const string& pf, pluginfiles) {
- Log::getLog("Rivet.Loader") << Log::TRACE << "Trying to load plugin analyses from file " << pf << endl;
+ Log::getLog("Rivet.AnalysisLoader") << Log::TRACE << "Trying to load plugin analyses from file " << pf << endl;
+ /// @todo Still needs lazy loading with new plugin design?
void* handle = dlopen(pf.c_str(), RTLD_LAZY);
if (!handle) {
- Log::getLog("Rivet.Loader") << Log::WARN << "Cannot open " << pf << ": " << dlerror() << endl;
+ Log::getLog("Rivet.AnalysisLoader") << Log::WARN << "Cannot open " << pf << ": " << dlerror() << endl;
continue;
}
- // Store a list of libs to be neatly closed later
- //_handles.insert(handle);
}
}
- // void AnalysisLoader::closeAnalysisBuilders() {
- // foreach (void* h, _handles) {
- // if (h) dlclose(h);
- // }
- // _handles.clear();
- // }
-
-
}
Modified: trunk/src/ProjectionHandler.cc
==============================================================================
--- trunk/src/ProjectionHandler.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/ProjectionHandler.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -117,17 +117,19 @@
}
- /// @todo Reinstate this check, since it suggests something is wrong
+ /// @todo Reinstate this check, since something is going wrong with undead projections!
// // If there is no match, check that the same parent hasn't already used this name for something else
// if (_namedprojs[&parent].find(name) != _namedprojs[&parent].end()) {
- // getLog() << Log::ERROR << parent.name() << " (" << &parent
- // << ") has already tried to register a different projection "
- // << "(" << _namedprojs[&parent][name] << ") "
- // << "with name '" << name << "'" << endl;
+ // getLog() << Log::ERROR << "Projection clash! "
+ // << parent.name() << " (" << &parent << ") "
+ // << "is trying to overwrite its registered '" << name << "' "
+ // << "projection (" << _namedprojs[&parent][name] << "="
+ // << _namedprojs[&parent][name]->name() << ") with a non-equivalent projection "
+ // << "(" << &proj << "=" << proj.name() << ")" << endl;
// ostringstream msg;
// msg << "Current projection hierarchy:" << endl;
// foreach (const NamedProjsMap::value_type& nps, _namedprojs) {
- // //const string parentname = (nps.first) ? nps.first->name() : "";
+ // //const string parentname = nps.first->name();
// msg << nps.first << endl; //"(" << parentname << ")" << endl;
// foreach (const NamedProjs::value_type& np, nps.second) {
// msg << " " << np.second << " (" << np.second->name()
Modified: trunk/src/Projections/FinalState.cc
==============================================================================
--- trunk/src/Projections/FinalState.cc Mon Aug 31 17:33:12 2009 (r1795)
+++ trunk/src/Projections/FinalState.cc Mon Aug 31 22:18:24 2009 (r1796)
@@ -11,9 +11,9 @@
{
setName("FinalState");
const bool openpt = isZero(minpt);
- const bool openeta = (mineta <= -MaxRapidity && maxeta >= MaxRapidity);
+ const bool openeta = (mineta <= -MAXRAPIDITY && maxeta >= MAXRAPIDITY);
getLog() << Log::TRACE << "Check for open FS conditions:" << std::boolalpha
- << " eta=" << openeta
+ << " eta=" << openeta
<< ", pt=" << openpt << endl;
if (!openeta || !openpt) {
addProjection(FinalState(), "OpenFS");
@@ -24,7 +24,7 @@
}
- FinalState::FinalState(const std::vector<std::pair<double, double> >& etaRanges, double minpt)
+ FinalState::FinalState(const vector<pair<double, double> >& etaRanges, double minpt)
: _etaRanges(etaRanges), _ptmin(minpt)
{
setName("FinalState");
@@ -32,7 +32,7 @@
/// @todo Properly check whether any of these eta ranges (or their combination) are actually open
const bool openeta = etaRanges.empty();
getLog() << Log::TRACE << "Check for open FS conditions:" << std::boolalpha
- << " eta=" << openeta
+ << " eta=" << openeta
<< ", pt=" << openpt << endl;
if (!openeta || !openpt) {
addProjection(FinalState(), "OpenFS");
More information about the Rivet-svn
mailing list
|