Skip to content

Commit

Permalink
Merge pull request #5975 from wmtan/AvoidUnneededIntrospection
Browse files Browse the repository at this point in the history 
CondFormats/PhysicsToolsObjects -- Avoid unnecessary introspection for MVAComputer
  • Loading branch information
@nclopezo
nclopezo committed Oct 24, 2014
2 parents d68c154 + d4e4789 commit 4ee8e37
Show file tree
Hide file tree
Showing 2 changed files with 124 additions and 43 deletions.
47 changes: 47 additions & 0 deletions CondFormats/PhysicsToolsObjects/interface/MVAComputer.h
View file
Expand Up @@ -14,6 +14,7 @@

#include "CondFormats/Serialization/interface/Serializable.h"

#include <memory>
#include <string>
#include <vector>
#include <map>
Expand Down Expand Up @@ -54,6 +55,9 @@ class VarProcessor {

virtual ~VarProcessor() {}
virtual std::string getInstanceName() const;
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif

COND_SERIALIZABLE;
};
Expand All @@ -73,38 +77,57 @@ class Variable {

class ProcOptional : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
std::vector<double> neutralPos;

COND_SERIALIZABLE;
};

class ProcCount : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
COND_SERIALIZABLE;
};

class ProcClassed : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
unsigned int nClasses;

COND_SERIALIZABLE;
};

class ProcSplitter : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
unsigned int nFirst;

COND_SERIALIZABLE;
};

class ProcForeach : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
unsigned int nProcs;

COND_SERIALIZABLE;
};

class ProcSort : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
unsigned int sortByIndex;
bool descending;

Expand All @@ -113,6 +136,9 @@ class ProcSort : public VarProcessor {

class ProcCategory : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
typedef std::vector<double> BinLimits;

std::vector<BinLimits> variableBinLimits;
Expand All @@ -123,6 +149,9 @@ class ProcCategory : public VarProcessor {

class ProcNormalize : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
std::vector<HistogramF> distr;
int categoryIdx;

Expand All @@ -131,6 +160,9 @@ class ProcNormalize : public VarProcessor {

class ProcLikelihood : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
class SigBkg {
public:
HistogramF background;
Expand All @@ -153,6 +185,9 @@ class ProcLikelihood : public VarProcessor {

class ProcLinear : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
std::vector<double> coeffs;
double offset;

Expand All @@ -161,6 +196,9 @@ class ProcLinear : public VarProcessor {

class ProcMultiply : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
typedef std::vector<unsigned int> Config;

unsigned int in;
Expand All @@ -171,13 +209,19 @@ class ProcMultiply : public VarProcessor {

class ProcMatrix : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
Matrix matrix;

COND_SERIALIZABLE;
};

class ProcExternal : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
virtual std::string getInstanceName() const;

std::string method;
Expand All @@ -188,6 +232,9 @@ class ProcExternal : public VarProcessor {

class ProcMLP : public VarProcessor {
public:
#ifndef __GCCXML__
virtual std::unique_ptr<VarProcessor> clone() const;
#endif
typedef std::pair<double, std::vector<double> > Neuron;
typedef std::pair<std::vector<Neuron>, bool> Layer;

Expand Down
120 changes: 77 additions & 43 deletions CondFormats/PhysicsToolsObjects/src/MVAComputer.cc
View file
Expand Up @@ -9,16 +9,10 @@
// the discriminator computer calibration object. POOL doesn't support
// polymorph pointers, so this is implemented using multiple containers
// for each possible sub-class and an index array from which the
// array of pointers can be reconstructed. In order to avoid having
// to handle each sub-class container by hand here, the generated
// reflex dictionary is used to find and read/write the std::vector<...>
// containers for the individual classes in the private data members.
// So changes can be solely done in the header files and does not leave
// a trail elsewhere.
// array of pointers can be reconstructed.
//
// Author: Christophe Saout
// Created: Sat Apr 24 15:18 CEST 2007
// $Id: MVAComputer.cc,v 1.10 2010/01/26 19:40:03 saout Exp $
//
#include <functional>
#include <algorithm>
Expand Down Expand Up @@ -53,6 +47,81 @@ std::string VarProcessor::getInstanceName() const
return type.substr(sizeof prefix - 1);
}

std::unique_ptr<VarProcessor>
VarProcessor::clone() const {
return(std::unique_ptr<VarProcessor>(new VarProcessor(*this)));
}

std::unique_ptr<VarProcessor>
ProcOptional::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcOptional(*this)));
}

std::unique_ptr<VarProcessor>
ProcCount::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcCount(*this)));
}

std::unique_ptr<VarProcessor>
ProcClassed::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcClassed(*this)));
}

std::unique_ptr<VarProcessor>
ProcSplitter::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcSplitter(*this)));
}

std::unique_ptr<VarProcessor>
ProcForeach::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcForeach(*this)));
}

std::unique_ptr<VarProcessor>
ProcSort::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcSort(*this)));
}

std::unique_ptr<VarProcessor>
ProcCategory::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcCategory(*this)));
}

std::unique_ptr<VarProcessor>
ProcNormalize::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcNormalize(*this)));
}

std::unique_ptr<VarProcessor>
ProcLikelihood::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcLikelihood(*this)));
}

std::unique_ptr<VarProcessor>
ProcLinear::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcLinear(*this)));
}

std::unique_ptr<VarProcessor>
ProcMultiply::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcMultiply(*this)));
}

std::unique_ptr<VarProcessor>
ProcMatrix::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcMatrix(*this)));
}

std::unique_ptr<VarProcessor>
ProcExternal::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcExternal(*this)));
}

std::unique_ptr<VarProcessor>
ProcMLP::clone() const {
return(std::unique_ptr<VarProcessor>(new ProcMLP(*this)));
}

std::string ProcExternal::getInstanceName() const
{
return method;
Expand Down Expand Up @@ -118,42 +187,7 @@ std::vector<VarProcessor*> MVAComputer::getProcessors() const
void MVAComputer::addProcessor(const VarProcessor *proc)
{
cacheId = getNextMVAComputerCacheId();

ROOT::Reflex::Type baseType = ROOT::Reflex::GetType<VarProcessor>();
ROOT::Reflex::Type type =
ROOT::Reflex::Type::ByTypeInfo(typeid(*proc));
ROOT::Reflex::Type refType(type,
ROOT::Reflex::CONST & ROOT::Reflex::REFERENCE);
if (!type.Name().size())
throw cms::Exception("MVAComputerCalibration")
<< "Calibration class " << typeid(*proc).name()
<< " not registered with ROOT::Reflex."
<< std::endl;

ROOT::Reflex::Object obj =
ROOT::Reflex::Object(baseType, const_cast<void*>(
static_cast<const void*>(proc))).CastObject(type);

// find and call copy constructor
for(ROOT::Reflex::Member_Iterator iter = type.FunctionMember_Begin();
iter != type.FunctionMember_End(); iter++) {
const ROOT::Reflex::Type &ctor = iter->TypeOf();
if (!iter->IsConstructor() ||
ctor.FunctionParameterSize() != 1 ||
ctor.FunctionParameterAt(0).Id() != refType.Id())
continue;

ROOT::Reflex::Object copy = type.Construct(ctor,
ROOT::Reflex::Tools::MakeVector<void*>(obj.Address()));

processors.push_back(static_cast<VarProcessor*>(copy.Address()));
return;
}

throw cms::Exception("MVAComputerCalibration")
<< "Calibration class " << typeid(*proc).name()
<< " has no copy ctor registered with ROOT::Reflex."
<< std::endl;
processors.push_back(proc->clone().release());
}

static MVAComputerContainer::CacheId getNextMVAComputerContainerCacheId()
Expand Down

0 comments on commit 4ee8e37

Please sign in to comment.