diff --git a/EventFilter/DTRawToDigi/interface/DTROS25Data.h b/EventFilter/DTRawToDigi/interface/DTROS25Data.h deleted file mode 100644 index 57ea5ecaa1df0..0000000000000 --- a/EventFilter/DTRawToDigi/interface/DTROS25Data.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef DTRawToDigi_DTROS25Data_h -#define DTRawToDigi_DTROS25Data_h - -/** \class DTROS25Data - * The collection containing DT ROS25 status data. - * - * \author M. Zanetti - INFN Padova - */ - -#include - -#include - - -typedef std::pair DTTDCData; - -class DTROS25Data { - -public: - - /// Constructors - DTROS25Data(int ROSId = 0): theROSId(ROSId) {} - - - /// Destructor - virtual ~DTROS25Data() {} - - /// Setters - inline void setROSId(const int & ID) { theROSId = ID; } - - inline void addROSTrailer( const DTROSTrailerWord & word) { theROSTrailers.push_back(word); } - inline void addROSError( const DTROSErrorWord & word) { theROSErrors.push_back(word); } - inline void addROSDebug( const DTROSDebugWord & word) { theROSDebugs.push_back(word); } - inline void addROBTrailer( const DTROBTrailerWord & word) { theROBTrailers.push_back(word); } - inline void addTDCMeasurement( const DTTDCMeasurementWord & word) { theTDCMeasurements.push_back(word); } - inline void addTDCData( const DTTDCData & tdcData) { theTDCData.push_back(tdcData); } - - /// Getters - inline int getROSID() const { return theROSId; } - - inline const std::vector& getROSTrailers() const {return theROSTrailers;} - inline const std::vector& getROSErrors() const {return theROSErrors;} - inline const std::vector& getROSDebugs() const {return theROSDebugs;} - inline const std::vector& getROBTrailers() const {return theROBTrailers;} - inline const std::vector& getTDCMeasurements() const {return theTDCMeasurements;} - inline const std::vector& getTDCData() const {return theTDCData;} - -private: - - int theROSId; - - std::vector theROSTrailers; - std::vector theROSErrors; - std::vector theROSDebugs; - std::vector theROBTrailers; - std::vector theTDCMeasurements; - std::vector theTDCData; - -}; - -#endif diff --git a/EventFilter/ESRawToDigi/interface/ESCrcKchipFast.h b/EventFilter/ESRawToDigi/interface/ESCrcKchipFast.h deleted file mode 100644 index 206cbc5c734dc..0000000000000 --- a/EventFilter/ESRawToDigi/interface/ESCrcKchipFast.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef ESCrcKchipFast_H -#define ESCrcKchipFast_H - -#include - -class ESCrcKchipFast { - - private : - - uint32_t crc; - - public: - - ESCrcKchipFast() { - init(); - reset() ; - }; - - void init() { - crc = 0x0ffff ; - } - - void reset() { - crc = 0x0ffff ; - } ; - - void add(unsigned int data) { - for (int i=0;i<16;i++) - { - if ((crc&0x0001) == (data&0x0001)) - crc=crc>>1; - else - crc=(crc>>1)^0x8408; // flipped 0x1021; - data=(data>>1); - } - }; - - uint32_t get_crc() { - return crc ; - }; - - bool isCrcOk(unsigned int crcin=0x0000) { - return ((get_crc()==crcin) ? true : false ); - }; - - ~ESCrcKchipFast() { } ; - -}; - -#endif diff --git a/EventFilter/EcalRawToDigi/interface/ECALUnpackerException.h b/EventFilter/EcalRawToDigi/interface/ECALUnpackerException.h deleted file mode 100644 index a9f1e57d0cdb2..0000000000000 --- a/EventFilter/EcalRawToDigi/interface/ECALUnpackerException.h +++ /dev/null @@ -1,32 +0,0 @@ -// Date : 30/05/2005 -// Author : N.Almeida (LIP) - -#ifndef ECALUNPACKEREXCEPTION_H -#define ECALUNPACKEREXCEPTION_H - -#include -#include -#include - - -class ECALUnpackerException { - public : - - /** - * Constructor - */ - ECALUnpackerException(std::ostringstream a){ info_=a.str(); } - - ECALUnpackerException(std::string a){info_=a;} - /** - * Exception's discription - */ - std::string what() const throw() { return info_;} - - protected : - - std::string info_; - -}; - -#endif diff --git a/EventFilter/EcalRawToDigi/interface/MyWatcher.h b/EventFilter/EcalRawToDigi/interface/MyWatcher.h deleted file mode 100644 index 5d26a0df24808..0000000000000 --- a/EventFilter/EcalRawToDigi/interface/MyWatcher.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef MyWATCHER_H -#define MyWATCHER_H - -#include "TStopwatch.h" -#include -#include - -#ifdef EDM_ML_DEBUG -class MyWatcher : public TStopwatch { - public: - MyWatcher(const std::string n=""):name(n),total(0) {} - ~MyWatcher(){} - - std::string start(bool r=true){Start(r); return " [Start]";} - std::string continu(){Continue(); return " [Continue]";} - std::string reset(){Reset(); return " [Reset]";} - std::string stop() {Stop(); return " [Stop]";} - std::string lap() { - std::stringstream o; - double r=RealTime(); - total+=r; - o<<"\n "< -#include -#include - - - - namespace evf - { - - - namespace moduleweb { - class ForkParams { - public: - ForkParams():slotId(-1),restart(0),isMaster(-1){} - int slotId; - bool restart; - int isMaster; - }; - class ForkInfoObj { - public: - ForkInfoObj() - { - control_sem_ = new sem_t; - sem_init(control_sem_,0,0); - stopCondition=0; - receivedStop_=false; - } - ~ForkInfoObj() - { - sem_destroy(control_sem_); - delete control_sem_; - } - void lock() {if (mst_lock_) pthread_mutex_lock(mst_lock_);} - void unlock() {if (mst_lock_) pthread_mutex_unlock(mst_lock_);} - void (*forkHandler) (void *); - ForkParams forkParams; - unsigned int stopCondition; - bool receivedStop_; - sem_t *control_sem_; - pthread_mutex_t * mst_lock_; - void * fuAddr; - }; - } - -} -#endif diff --git a/EventFilter/Utilities/interface/config_json.h b/EventFilter/Utilities/interface/config_json.h deleted file mode 100644 index 5d334cbc5e6b9..0000000000000 --- a/EventFilter/Utilities/interface/config_json.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef JSON_CONFIG_H_INCLUDED -# define JSON_CONFIG_H_INCLUDED - -/// If defined, indicates that json library is embedded in CppTL library. -//# define JSON_IN_CPPTL 1 - -/// If defined, indicates that json may leverage CppTL library -//# define JSON_USE_CPPTL 1 -/// If defined, indicates that cpptl vector based map should be used instead of std::map -/// as Value container. -//# define JSON_USE_CPPTL_SMALLMAP 1 -/// If defined, indicates that Json specific container should be used -/// (hash table & simple deque container with customizable allocator). -/// THIS FEATURE IS STILL EXPERIMENTAL! -//# define JSON_VALUE_USE_INTERNAL_MAP 1 -/// Force usage of standard new/malloc based allocator instead of memory pool based allocator. -/// The memory pools allocator used optimization (initializing Value and ValueInternalLink -/// as if it was a POD) that may cause some validation tool to report errors. -/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined. -//# define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1 - -/// If defined, indicates that Json use exception to report invalid type manipulation -/// instead of C assert macro. -# define JSON_USE_EXCEPTION 1 - -# ifdef JSON_IN_CPPTL -# include -# ifndef JSON_USE_CPPTL -# define JSON_USE_CPPTL 1 -# endif -# endif - -# ifdef JSON_IN_CPPTL -# define JSON_API CPPTL_API -# elif defined(JSON_DLL_BUILD) -# define JSON_API __declspec(dllexport) -# elif defined(JSON_DLL) -# define JSON_API __declspec(dllimport) -# else -# define JSON_API -# endif - -#endif // JSON_CONFIG_H_INCLUDED diff --git a/FWCore/ServiceRegistry/interface/TypeInfoHolder.h b/FWCore/ServiceRegistry/interface/TypeInfoHolder.h deleted file mode 100644 index f09e6d65b49fb..0000000000000 --- a/FWCore/ServiceRegistry/interface/TypeInfoHolder.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef ServiceRegistry_TypeInfoHolder_h -#define ServiceRegistry_TypeInfoHolder_h - -#include -// -*- C++ -*- -// -// Package: ServiceRegistry -// Class : TypeInfoHolder -// -/**\class TypeInfoHolder TypeInfoHolder.h FWCore/ServiceRegistry/interface/TypeInfoHolder.h - - Description: wrapper to allow std::type_info to be used as a key to a std::map - - Usage: - - -*/ -// -// Original Author: Chris Jones -// Created: Mon Sep 5 14:38:42 EDT 2005 -// - -// system include files - -// user include files - -// forward declarations -namespace edm { - namespace serviceregistry { - - class TypeInfoHolder { - public: - TypeInfoHolder(const std::type_info& iInfo) : m_info(iInfo) {} - const std::type_info& info() const { return m_info;} - - bool operator<(const TypeInfoHolder& iRHS) const { - return m_info.before(iRHS.m_info) ; - } - private: - const std::type_info& m_info; - }; - } -} - -#endif diff --git a/GeneratorInterface/TauolaInterface/interface/TauolaWrapper.h b/GeneratorInterface/TauolaInterface/interface/TauolaWrapper.h deleted file mode 100644 index 9a998a1a68c58..0000000000000 --- a/GeneratorInterface/TauolaInterface/interface/TauolaWrapper.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef gen_ExternalDecays_TauolaWrapper_h -#define gen_ExternalDecays_TauolaWrapper_h - -/********** TauolaWrapper - * - * Wrapper to Fortran functions in TAUOLA tau decay library - * - * Christian Veelken - * 04/17/07 - * - * Modified to contain access to individual decays (COMMON TAUBRA), and - * force polarization like in case of particle gun taus (SUBROUTINE DEXAY - * and COMMON MOMDEC) - * 23.2.2009/S.Lehti - * - * Modified to remove everything related to pythia6 or pretauola; - * all pythia6-related functionalities and/or ties are moving back - * to Pythia6Interface; - * the concept will ensure transparent use of Tauola with ANY - * multi-purpose generator - * J.V.Yarba, Feb.26, 2009 - * - ***************************************/ - -// -//------------------------------------------------------------------------------- -// - -// main function(s) of TAUOLA/pretauola tau decay library - -extern "C" { - void tauola_(int*, int*); - void tauola_srs_(int*,int*); - void taurep_(int*); - void ranmar_(float*,int*); - void rmarin_(int*, int*, int*); -} -#define tauola tauola_ - -void inline call_tauola (int mode, int polarization) { tauola(&mode, &polarization); } - -extern "C" { - extern void dexay_(int*, float[4]); -} -#define dexay dexay_ - -void inline call_dexay (int mode, float polarization[4]) { dexay(&mode, polarization); } - -// -//------------------------------------------------------------------------------- -// - -// common block with steering parameters for CMS specific Fortran interface to TAUOLA - -extern "C" { - extern struct { - int pjak1; - int pjak2; - int mdtau; - } ki_taumod_; -} -#define ki_taumod ki_taumod_ - -extern "C" { - extern struct { - int jak1; - int jak2; - int itdkrc; - int ifphot; - int ifhadm; - int ifhadp; - } libra_ ; -} -#define libra libra_ - -extern "C" { - extern struct { - float gamprt[30]; - int jlist[30]; - int nchan; - } taubra_; -} -#define taubra taubra_ - -extern "C" { - extern struct { - double q1[4]; - double q2[4]; - double p1[4]; - double p2[4]; - double p3[4]; - double p4[4]; - } momdec_; -} -#define momdec momdec_ - -extern "C" { - extern struct { - int np1; - int np2; - } taupos_; -} -#define taupos taupos_ - -#endif diff --git a/HeavyFlavorAnalysis/SpecificDecay/interface/BPHMuonChargeSelect.h b/HeavyFlavorAnalysis/SpecificDecay/interface/BPHMuonChargeSelect.h deleted file mode 100644 index 3f7d574ed79fc..0000000000000 --- a/HeavyFlavorAnalysis/SpecificDecay/interface/BPHMuonChargeSelect.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef HeavyFlavorAnalysis_SpecificDecay_BPHMuonChargeSelect_h -#define HeavyFlavorAnalysis_SpecificDecay_BPHMuonChargeSelect_h -/** \class BPHMuonChargeSelect - * - * Description: - * Class for muon selection by charge - * - * \author Paolo Ronchese INFN Padova - * - */ - -//---------------------- -// Base Class Headers -- -//---------------------- -#include "HeavyFlavorAnalysis/SpecificDecay/interface/BPHParticleChargeSelect.h" - -//------------------------------------ -// Collaborating Class Declarations -- -//------------------------------------ -#include "DataFormats/PatCandidates/interface/Muon.h" - -//--------------- -// C++ Headers -- -//--------------- - -// --------------------- -// -- Class Interface -- -// --------------------- - -class BPHMuonChargeSelect : public BPHParticleChargeSelect { -public: - /** Constructor - */ - BPHMuonChargeSelect(int c) : BPHParticleChargeSelect(c) {} - - // deleted copy constructor and assignment operator - BPHMuonChargeSelect(const BPHMuonChargeSelect& x) = delete; - BPHMuonChargeSelect& operator=(const BPHMuonChargeSelect& x) = delete; - - /** Destructor - */ - ~BPHMuonChargeSelect() override {} - - /** Operations - */ - /// select muon - bool accept(const reco::Candidate& cand) const override { - if (dynamic_cast(&cand) == nullptr) - return false; - return BPHParticleChargeSelect::accept(cand); - }; -}; - -#endif diff --git a/HeavyFlavorAnalysis/SpecificDecay/interface/BPHParticleChargeSelect.h b/HeavyFlavorAnalysis/SpecificDecay/interface/BPHParticleChargeSelect.h deleted file mode 100644 index e85f05677bad2..0000000000000 --- a/HeavyFlavorAnalysis/SpecificDecay/interface/BPHParticleChargeSelect.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef HeavyFlavorAnalysis_SpecificDecay_BPHParticleChargeSelect_h -#define HeavyFlavorAnalysis_SpecificDecay_BPHParticleChargeSelect_h -/** \class BPHParticleChargeSelect - * - * Description: - * Class for particle selection by charge - * - * \author Paolo Ronchese INFN Padova - * - */ - -//---------------------- -// Base Class Headers -- -//---------------------- -#include "HeavyFlavorAnalysis/RecoDecay/interface/BPHRecoSelect.h" - -//------------------------------------ -// Collaborating Class Declarations -- -//------------------------------------ -#include "DataFormats/RecoCandidate/interface/RecoCandidate.h" - -//--------------- -// C++ Headers -- -//--------------- - -// --------------------- -// -- Class Interface -- -// --------------------- - -class BPHParticleChargeSelect : public BPHRecoSelect { -public: - /** Constructor - */ - BPHParticleChargeSelect(int c) : charge(c ? (c > 0 ? 1 : -1) : 0) {} - - // deleted copy constructor and assignment operator - BPHParticleChargeSelect(const BPHParticleChargeSelect& x) = delete; - BPHParticleChargeSelect& operator=(const BPHParticleChargeSelect& x) = delete; - - /** Destructor - */ - ~BPHParticleChargeSelect() override {} - - /** Operations - */ - /// select particle - bool accept(const reco::Candidate& cand) const override { - switch (charge) { - default: - case 0: - return (cand.charge() != 0); - case 1: - return (cand.charge() > 0); - case -1: - return (cand.charge() < 0); - } - return true; - }; - - /// set selection charge - void setCharge(int c) { - charge = (c ? (c > 0 ? 1 : -1) : 0); - return; - } - - /// get selection charge - double getCharge() const { return charge; } - -private: - int charge; -}; - -#endif diff --git a/IOPool/Common/interface/CustomStreamer.h b/IOPool/Common/interface/CustomStreamer.h deleted file mode 100644 index 5f07f3e7fd904..0000000000000 --- a/IOPool/Common/interface/CustomStreamer.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef IOPool_Common_CustomStreamer_h -#define IOPool_Common_CustomStreamer_h - -#include -#include "TClass.h" -#include "TClassStreamer.h" -#include "TClassRef.h" -#include "FWCore/Utilities/interface/TypeID.h" -#include "TBuffer.h" - -namespace edm { - template - class CustomStreamer : public TClassStreamer { - public: - typedef T element_type; - CustomStreamer(); - void operator() (TBuffer &R__b, void *objp); - private: - std::string className_; - TClassRef cl_; - }; - - template - CustomStreamer::CustomStreamer() : - className_(TypeID(typeid(T)).className()), - cl_(className_.c_str()) - {} - - template - void - CustomStreamer::operator()(TBuffer &R__b, void *objp) { - if (R__b.IsReading()) { - cl_->ReadBuffer(R__b, objp); - } else { - cl_->WriteBuffer(R__b, objp); - } - } - - template - void - SetCustomStreamer() { - TClass *cl = TClass::GetClass(typeid(T)); - if (cl->GetStreamer() == 0) { - cl->AdoptStreamer(new CustomStreamer()); - } - } - - template - void - SetCustomStreamer(T const&) { - TClass *cl = TClass::GetClass(typeid(T)); - if (cl->GetStreamer() == 0) { - cl->AdoptStreamer(new CustomStreamer()); - } - } -} - -#endif diff --git a/JetMETCorrections/InterpolationTables/interface/BoxNDScanner.h b/JetMETCorrections/InterpolationTables/interface/BoxNDScanner.h deleted file mode 100644 index 44d32c6b037da..0000000000000 --- a/JetMETCorrections/InterpolationTables/interface/BoxNDScanner.h +++ /dev/null @@ -1,172 +0,0 @@ -#ifndef NPSTAT_BOXNDSCANNER_HH_ -#define NPSTAT_BOXNDSCANNER_HH_ - -/*! -// \file BoxNDScanner.h -// -// \brief Iteration over uniformly spaced coordinates inside -// a multidimensional box -// -// Author: I. Volobouev -// -// March 2010 -*/ - -#include "JetMETCorrections/InterpolationTables/interface/BoxND.h" - -namespace npstat { - /** - * A class for iterating over all coordinates in a multidimensional box - * (but not a full-fledeged iterator). The expected usage pattern is as - * follows: - * - * @code - * double* coords = ... (the buffer size should be at least box.dim()) - * for (BoxNDScanner scan(box,shape); scan.isValid(); ++scan) - * { - * scan.getCoords(coords, coordsBufferSize); - * .... Do what is necessary with coordinates .... - * .... Extract linear bin number: .............. - * scan.state(); - * } - * @endcode - * - * The coordinates will be in the middle of the bins (imagine - * a multivariate histogram with boundaries defined by the given box). - */ - template - class BoxNDScanner - { - public: - //@{ - /** - // Constructor from a bounding box and a multidimensional - // array shape - */ - inline BoxNDScanner(const BoxND& box, - const std::vector& shape) - : box_(box), state_(0UL) - {initialize(shape.empty() ? static_cast(0) : - &shape[0], shape.size());} - - inline BoxNDScanner(const BoxND& box, - const unsigned* shape, const unsigned lenShape) - : box_(box), state_(0UL) {initialize(shape, lenShape);} - //@} - - /** Dimensionality of the scan */ - inline unsigned dim() const {return box_.dim();} - - /** Retrieve current state (i.e., linear index of the scan) */ - inline unsigned long state() const {return state_;} - - /** Maximum possible state (i.e., linear index of the scan) */ - inline unsigned long maxState() const {return maxState_;} - - /** Returns false when iteration is complete */ - inline bool isValid() const {return state_ < maxState_;} - - /** Retrieve current coordinates inside the box */ - void getCoords(Numeric* x, unsigned nx) const; - - /** Retrieve current multidimensional index */ - void getIndex(unsigned* index, unsigned indexBufferLen) const; - - /** Reset the state (as if the object has just been constructed) */ - inline void reset() {state_ = 0UL;} - - /** Prefix increment */ - inline BoxNDScanner& operator++() - {if (state_ < maxState_) ++state_; return *this;} - - /** Postfix increment (distinguished by the dummy "int" parameter) */ - inline void operator++(int) {if (state_ < maxState_) ++state_;} - - /** Set the state directly */ - inline void setState(const unsigned long state) - {state_ = state <= maxState_ ? state : maxState_;} - - private: - BoxNDScanner(); - - void initialize(const unsigned* shape, unsigned lenShape); - - BoxND box_; - std::vector strides_; - std::vector bw_; - unsigned long state_; - unsigned long maxState_; - }; -} - -#include -#include "JetMETCorrections/InterpolationTables/interface/NpstatException.h" - -namespace npstat { - template - void BoxNDScanner::initialize(const unsigned* shape, - const unsigned dim) - { - if (!(dim && box_.dim() == dim)) throw npstat::NpstatInvalidArgument( - "In npstat::BoxNDScanner::initialize: incompatible scan shape"); - assert(shape); - for (unsigned j=0; j0; --j) - strides_[j - 1] = strides_[j]*shape[j]; - maxState_ = strides_[0]*shape[0]; - - bw_.reserve(dim); - for (unsigned j=0; j - void BoxNDScanner::getCoords(Numeric* x, const unsigned nx) const - { - const unsigned dim = strides_.size(); - if (nx < dim) throw npstat::NpstatInvalidArgument( - "In npstat::BoxNDScanner::getCoords: " - "insufficient length of the output buffer"); - if (state_ >= maxState_) throw npstat::NpstatRuntimeError( - "In npstat::BoxNDScanner::getCoords: invalid scanner state"); - assert(x); - - unsigned long l = state_; - for (unsigned i=0; i - void BoxNDScanner::getIndex(unsigned* ix, const unsigned nx) const - { - const unsigned dim = strides_.size(); - if (nx < dim) throw npstat::NpstatInvalidArgument( - "In npstat::BoxNDScanner::getIndex: " - "insufficient length of the output buffer"); - if (state_ >= maxState_) throw npstat::NpstatRuntimeError( - "In npstat::BoxNDScanner::getIndex: invalid scanner state"); - assert(ix); - - unsigned long l = state_; - for (unsigned i=0; i(idx); - l -= (idx * strides_[i]); - } - } -} - - -#endif // NPSTAT_BOXNDSCANNER_HH_ - diff --git a/JetMETCorrections/InterpolationTables/interface/MultivariateFunctorScanner.h b/JetMETCorrections/InterpolationTables/interface/MultivariateFunctorScanner.h deleted file mode 100644 index c34494d45b63e..0000000000000 --- a/JetMETCorrections/InterpolationTables/interface/MultivariateFunctorScanner.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef NPSTAT_MULTIVARIATEFUNCTORSCANNER_HH_ -#define NPSTAT_MULTIVARIATEFUNCTORSCANNER_HH_ - -/*! -// \file MultivariateFunctorScanner.h -// -// \brief Adapts any AbsMultivariateFunctor for use with ArrayND method -// "functorFill" -// -// Author: I. Volobouev -// -// July 2012 -*/ - -#include -#include -#include "JetMETCorrections/InterpolationTables/interface/NpstatException.h" - -#include "JetMETCorrections/InterpolationTables/interface/AbsMultivariateFunctor.h" - -namespace npstat { - /** - // This class adapts an object derived from AbsMultivariateFunctor - // so that it can be used with ArrayND method "functorFill" and such - */ - template - class MultivariateFunctorScanner - { - public: - /** - // A mapper for each coordinate in the "maps" argument will - // convert the array index into a proper argument for the scanned - // density. - // - // This functor will NOT make copies of either "fcn" or "maps" - // parameters. These parameters will be used by reference only - // (aliased). It is up to the user of this class to ensure proper - // lifetime of these objects. - */ - inline MultivariateFunctorScanner(const AbsMultivariateFunctor& fcn, - const std::vector& maps) - : fcn_(fcn), mapping_(maps), buf_(fcn.minDim()), dim_(fcn.minDim()) - { - if (!(dim_ && dim_ == maps.size())) throw npstat::NpstatInvalidArgument( - "In npstat::MultivariateFunctorScanner constructor: " - "incompatible arguments"); - if (dim_ != fcn.maxDim()) throw npstat::NpstatInvalidArgument( - "In npstat::MultivariateFunctorScanner constructor: " - "functors of variable dimensionality are not supported"); - } - - /** Calculate the functor value for the given array indices */ - inline double operator()(const unsigned* index, - const unsigned indexLen) const - { - if (dim_ != indexLen) throw npstat::NpstatInvalidArgument( - "In npstat::MultivariateFunctorScanner::operator(): " - "incompatible input point dimensionality"); - assert(index); - double* x = &buf_[0]; - for (unsigned i=0; i& mapping_; - mutable std::vector buf_; - unsigned dim_; - }; -} - -#endif // NPSTAT_MULTIVARIATEFUNCTORSCANNER_HH_ - diff --git a/JetMETCorrections/InterpolationTables/interface/rescanArray.h b/JetMETCorrections/InterpolationTables/interface/rescanArray.h deleted file mode 100644 index 08742b7113908..0000000000000 --- a/JetMETCorrections/InterpolationTables/interface/rescanArray.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef NPSTAT_RESCANARRAY_HH_ -#define NPSTAT_RESCANARRAY_HH_ - -/*! -// \file rescanArray.h -// -// \brief Fill a multidimensional array using values from another array -// with a different shape -// -// Author: I. Volobouev -// -// October 2010 -*/ - -#include "JetMETCorrections/InterpolationTables/interface/ArrayND.h" - -namespace npstat { - /** - // A utility for filling one array using values of another. The - // array shapes do not have to be the same but the ranks have to be. - // Roughly, the arrays are treated as values of histogram bins inside - // the unit box. The array "to" is filled either with the closest bin - // value of the array "from" or with an interpolated value (if - // "interpolationDegree" parameter is not 0). - // - // interpolationDegree parameter must be one of 0, 1, or 3. - */ - template - void rescanArray(const ArrayND& from, - ArrayND* to, - unsigned interpolationDegree=0); -} - -#include -#include "JetMETCorrections/InterpolationTables/interface/NpstatException.h" - -#include "JetMETCorrections/InterpolationTables/interface/LinearMapper1d.h" - -namespace npstat { - namespace Private { - template - class ArrayMapper - { - public: - ArrayMapper(const ArrayND& from, - const ArrayND& to, - const unsigned interpolationDegree) - : mapped_(from.rank()), - from_(from), - dim_(from.rank()), - ideg_(interpolationDegree) - { - assert(dim_ == to.rank()); - if (dim_) - { - mappers_.reserve(dim_); - for (unsigned i=0; i mappers_; - mutable std::vector mapped_; - const ArrayND& from_; - unsigned dim_; - unsigned ideg_; - }; - } - - template - void rescanArray(const ArrayND& from, - ArrayND* to, - const unsigned interpolationDegree) - { - assert(to); - if (from.rank() != to->rank()) throw npstat::NpstatInvalidArgument( - "In npstat::rescanArray: incompatible dimensionalities " - "of input and output arrays"); - if (!(interpolationDegree == 0U || - interpolationDegree == 1U || - interpolationDegree == 3U)) throw npstat::NpstatInvalidArgument( - "In npstat::rescanArray: unsupported interpolation degree"); - to->functorFill(Private::ArrayMapper( - from, *to, interpolationDegree)); - } -} - - -#endif // NPSTAT_RESCANARRAY_HH_ - diff --git a/JetMETCorrections/Type1MET/interface/CorrectedMETProducerT.h b/JetMETCorrections/Type1MET/interface/CorrectedMETProducerT.h deleted file mode 100644 index 298d28b228224..0000000000000 --- a/JetMETCorrections/Type1MET/interface/CorrectedMETProducerT.h +++ /dev/null @@ -1,110 +0,0 @@ -#ifndef JetMETCorrections_Type1MET_CorrectedMETProducer_h -#define JetMETCorrections_Type1MET_CorrectedMETProducer_h - -/** \class CorrectedMETProducerT - * - * Produce MET collections with Type 1 / Type 1 + 2 corrections applied - * - * NOTE: This file defines the generic template. - * Concrete instances for CaloMET and PFMET are defined in - * JetMETCorrections/Type1MET/plugins/CorrectedCaloMETProducer.cc - * JetMETCorrections/Type1MET/plugins/CorrectedPFMETProducer.cc - * - * \authors Michael Schmitt, Richard Cavanaugh, The University of Florida - * Florent Lacroix, University of Illinois at Chicago - * Christian Veelken, LLR - * - * - * - */ - -#include "FWCore/Framework/interface/stream/EDProducer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/InputTag.h" -#include "FWCore/Framework/interface/ConsumesCollector.h" -#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" -#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" - -#include "JetMETCorrections/Type1MET/interface/METCorrectionAlgorithm.h" -#include "DataFormats/METReco/interface/CorrMETData.h" -#include "DataFormats/Candidate/interface/Candidate.h" - -#include "HLTrigger/HLTcore/interface/defaultModuleLabel.h" - -#include - -namespace CorrectedMETProducer_namespace { - template - reco::Candidate::LorentzVector correctedP4(const T& rawMEt, const CorrMETData& correction) { - double correctedMEtPx = rawMEt.px() + correction.mex; - double correctedMEtPy = rawMEt.py() + correction.mey; - double correctedMEtPt = sqrt(correctedMEtPx * correctedMEtPx + correctedMEtPy * correctedMEtPy); - return reco::Candidate::LorentzVector(correctedMEtPx, correctedMEtPy, 0., correctedMEtPt); - } - - template - double correctedSumEt(const T& rawMEt, const CorrMETData& correction) { - return rawMEt.sumEt() + correction.sumet; - } - - template - class CorrectedMETFactoryT { - public: - T operator()(const T&, const CorrMETData&) const { - assert(0); // "place-holder" for template instantiations for concrete T types only, **not** to be called - } - }; -} // namespace CorrectedMETProducer_namespace - -template -class CorrectedMETProducerT : public edm::stream::EDProducer<> { - typedef std::vector METCollection; - -public: - explicit CorrectedMETProducerT(const edm::ParameterSet& cfg) - : moduleLabel_(cfg.getParameter("@module_label")), algorithm_(0) { - token_ = consumes(cfg.getParameter("src")); - - algorithm_ = new METCorrectionAlgorithm(cfg, consumesCollector()); - - produces(""); - } - ~CorrectedMETProducerT() { delete algorithm_; } - - static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { - edm::ParameterSetDescription desc; - desc.add("src", edm::InputTag("corrPfMetType1", "type1")); - descriptions.add(defaultModuleLabel >(), desc); - } - -private: - void produce(edm::Event& evt, const edm::EventSetup& es) { - std::unique_ptr correctedMEtCollection(new METCollection); - - edm::Handle rawMEtCollection; - evt.getByToken(token_, rawMEtCollection); - - for (typename METCollection::const_iterator rawMEt = rawMEtCollection->begin(); rawMEt != rawMEtCollection->end(); - ++rawMEt) { - CorrMETData correction = algorithm_->compMETCorrection(evt); - - static const CorrectedMETProducer_namespace::CorrectedMETFactoryT correctedMET_factory{}; - T correctedMEt = correctedMET_factory(*rawMEt, correction); - - correctedMEtCollection->push_back(correctedMEt); - } - - //--- add collection of MET objects with Type 1 / Type 1 + 2 corrections applied to the event - evt.put(std::move(correctedMEtCollection)); - } - - std::string moduleLabel_; - - edm::EDGetTokenT token_; - - METCorrectionAlgorithm* algorithm_; // algorithm for computing Type 1 / Type 1 + 2 MET corrections -}; - -#endif diff --git a/L1Trigger/DTSectorCollector/interface/DTSCCand.h b/L1Trigger/DTSectorCollector/interface/DTSCCand.h deleted file mode 100644 index 3f7a616799466..0000000000000 --- a/L1Trigger/DTSectorCollector/interface/DTSCCand.h +++ /dev/null @@ -1,123 +0,0 @@ -//------------------------------------------------- -// -// \class: DTSC.h -/** - * Implementation of Sector Collector trigger algorithm - * - * - * - * \author D. Bonacorsi, S. Marcellini - */ -// -//-------------------------------------------------- -#ifndef DT_SC_H -#define DT_SC_H - -//------------------------------------ -// Collaborating Class Declarations -- -//------------------------------------ -class DTTracoTrigData; -class DTTSCand; -class DTConfigSectColl; -// added DBSM -class DTTrigGeom; - -//---------------------- -// Base Class Headers -- -//---------------------- -// added DBSM -#include "L1Trigger/DTUtilities/interface/DTGeomSupplier.h" - -//--------------- -// C++ Headers -- -//--------------- -#include - -// --------------------- -// -- Class Interface -- -// --------------------- - - -class DTSC{ - - public: - - //! Constructor - DTSC(DTConfigSectColl*); - - //! Destructor - ~DTSC(); - - // non-const methods - - //! Add a TSM candidate to the Sect Coll, ifs is first/second track flag - void addCand(DTTSCand* cand); - - //! Set a flag to skip sort2 - void ignoreSecondTrack() { _ignoreSecondTrack=1; } - - //! Run the Sector Collector algorithm - void run(); - - //! Sort 1 - DTTSCand* DTSectCollsort1(); - - //! Sort 2 - DTTSCand* DTSectCollsort2(); - - //! Clear - void clear(); - - // const methods - - //! Configuration set - inline DTConfigSectColl* config() const { return _config; } - - //! Return the number of input tracks (first/second) - unsigned nCand(int ifs) const; - - //! Return the number of input first tracks - inline int nFirstT() const { return _incand[0].size(); } - - //! Return the number of input second tracks - inline int nSecondT() const { return _incand[1].size(); } - - //! Return requested TSS candidate - DTTSCand* getDTTSCand(int ifs, unsigned n) const; - - //! Return requested TRACO trigger - const DTTracoTrigData* getTracoT(int ifs, unsigned n) const; - - //! Return the number of sorted tracks - inline int nTracks() const { return _outcand.size(); } - - //! Return the requested track - DTTSCand* getTrack(int n) const ; - - - private: - - // Configuration - DTConfigSectColl* _config; - - // input data - std::vector _incand[2]; - - // output data - std::vector _outcand; - - // internal use variables - int _ignoreSecondTrack; - - -}; -#endif - - - - - - - - - diff --git a/L1Trigger/GlobalCaloTrigger/interface/L1GctSimpleJetFinder.h b/L1Trigger/GlobalCaloTrigger/interface/L1GctSimpleJetFinder.h deleted file mode 100644 index 35fa1897822ac..0000000000000 --- a/L1Trigger/GlobalCaloTrigger/interface/L1GctSimpleJetFinder.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef L1GCTSIMPLEJETFINDER_H_ -#define L1GCTSIMPLEJETFINDER_H_ - -#include "L1Trigger/GlobalCaloTrigger/interface/L1GctJetFinderBase.h" - -#include - -/*! \class L1GctSimpleJetFinder - * \brief simple jet finder for test purposes. - * - * Currently returns no jets - * The intention is to return local maxima (without clustering) - * - */ -/* - * \author Greg Heath - * \date June 2006 - */ - -class L1GctSimpleJetFinder : public L1GctJetFinderBase { -public: - /// id is 0-8 for -ve Eta jetfinders, 9-17 for +ve Eta, for increasing Phi. - L1GctSimpleJetFinder(int id); - - ~L1GctSimpleJetFinder(); - - /// Overload << operator - friend std::ostream& operator<<(std::ostream& os, const L1GctSimpleJetFinder& algo); - - /// get input data from sources - virtual void fetchInput(); - - /// process the data, fill output buffers - virtual void process(); - -protected: - // Each jetFinder must define the constants as private and copy the - // function definitions below. - virtual unsigned maxRegionsIn() const { return MAX_REGIONS_IN; } - virtual unsigned centralCol0() const { return CENTRAL_COL0; } - virtual unsigned nCols() const { return N_COLS; } - -private: - /// The real jetFinders must define these constants - static const unsigned int MAX_REGIONS_IN; ///< Dependent on number of rows and columns. - static const unsigned int N_COLS; - static const unsigned int CENTRAL_COL0; - - void findJets(); -}; - -std::ostream& operator<<(std::ostream& os, const L1GctSimpleJetFinder& algo); - -#endif /*L1GCTSIMPLEJETFINDER_H_*/ diff --git a/L1Trigger/L1TCalorimeter/interface/classes.h b/L1Trigger/L1TCalorimeter/interface/classes.h deleted file mode 100644 index 5c23744bb10d3..0000000000000 --- a/L1Trigger/L1TCalorimeter/interface/classes.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * ======================================================================== - * - * Description: Define dataformats for L1RecoMatch, L1 Global object. - * - * ======================================================================== - */ - -#include "L1Trigger/L1TCalorimeter/interface/L1RecoMatch.h" -#include "L1Trigger/L1TCalorimeter/interface/L1GObject.h" - -namespace { - - L1RecoMatch dummyMatch; - L1GObject dummyL1G; - std::vector dummyL1GCollection; - edm::Wrapper > dummyL1GWrapper; - -} diff --git a/L1Trigger/L1TMuonOverlap/interface/OMTFConfigurator.h b/L1Trigger/L1TMuonOverlap/interface/OMTFConfigurator.h deleted file mode 100644 index 82bd4a5d7c64f..0000000000000 --- a/L1Trigger/L1TMuonOverlap/interface/OMTFConfigurator.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef OMTF_OMTFConfigurator_H -#define OMTF_OMTFConfigurator_H - -#include "xercesc/dom/DOM.hpp" - - -////////////////////////////////// -// OMTFConfigurator -////////////////////////////////// -class OMTFConfigurator{ - - public: - - - private: - -}; - - -////////////////////////////////// -////////////////////////////////// - - - -#endif diff --git a/L1Trigger/L1TMuonOverlap/interface/OMTFPatternMaker.h b/L1Trigger/L1TMuonOverlap/interface/OMTFPatternMaker.h deleted file mode 100644 index 60898ad2a730e..0000000000000 --- a/L1Trigger/L1TMuonOverlap/interface/OMTFPatternMaker.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef OMTF_OMTFPaternMaker_H -#define OMTF_OMTFPaternMaker_H - -#include - -#include "L1Trigger/L1TMuonOverlap/interface/GoldenPattern.h" - -class OMTFConfiguration; -class XMLConfigReader; -class OMTFinput; - -namespace edm{ -class ParameterSet; -} - -class OMTFPaternMaker{ - - public: - - OMTFPaternMaker(const edm::ParameterSet & cfg); - - ~OMTFPaternMaker(); - - private: - - ///Map holding Golden Patterns - std::map theGPs; - -}; - - -#endif diff --git a/L1Trigger/L1TNtuples/interface/L1AnalysisRecoTrackBase.h b/L1Trigger/L1TNtuples/interface/L1AnalysisRecoTrackBase.h deleted file mode 100644 index 2f19f4a6b092c..0000000000000 --- a/L1Trigger/L1TNtuples/interface/L1AnalysisRecoTrackBase.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __L1Analysis_L1AnalysisRecoTrackBase_H__ -#define __L1Analysis_L1AnalysisRecoTrackBase_H__ - - -namespace L1Analysis -{ - class L1AnalysisRecoTrackBase - { - public : - unsigned nTrk; - unsigned nHighPurity; - double fHighPurity; - }; -} -#endif - - diff --git a/L1TriggerOffline/L1Analyzer/interface/L1PromptAnalysis.h b/L1TriggerOffline/L1Analyzer/interface/L1PromptAnalysis.h deleted file mode 100644 index d6d29a3eef1a6..0000000000000 --- a/L1TriggerOffline/L1Analyzer/interface/L1PromptAnalysis.h +++ /dev/null @@ -1,288 +0,0 @@ - -//------------------------------------------------- -// -// \class L1PromptAnalysis -/** - * Description: This code is designed for l1 prompt analysis -// starting point is a GMTTreeMaker By Ivan Mikulec. -*/ -// -// I. Mikulec HEPHY Vienna -// -//-------------------------------------------------- -#ifndef L1_PROMPT_ANALYSIS_H -#define L1_PROMPT_ANALYSIS_H - -//--------------- -// C++ Headers -- -//--------------- - -#include -#include - -//---------------------- -// Base Class Headers -- -//---------------------- -#include "FWCore/Framework/interface/EDAnalyzer.h" - -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Framework/interface/Event.h" -#include "DataFormats/Common/interface/Handle.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -//------------------------------------ -// Collaborating Class Declarations -- -//------------------------------------ - -#include "DataFormats/L1GlobalMuonTrigger/interface/L1MuRegionalCand.h" -#include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h" -#include "FWCore/Utilities/interface/InputTag.h" - -class TFile; -class TTree; - -// --------------------- -// -- Class Interface -- -// --------------------- - -const int MAXGEN = 20; -const int MAXRPC = 12; -const int MAXDTBX = 12; -const int MAXCSC = 12; -const int MAXGMT = 12; -const int MAXGT = 12; -const int MAXRCTREG = 400; -const int MAXDTPH = 50; -const int MAXDTTH = 50; -const int MAXDTTR = 50; - -class L1PromptAnalysis : public edm::EDAnalyzer { -public: - // constructor - explicit L1PromptAnalysis(const edm::ParameterSet&); - virtual ~L1PromptAnalysis(); - - // fill tree - virtual void analyze(const edm::Event&, const edm::EventSetup&); - void book(); - - virtual void beginJob(); - virtual void endJob(); - -private: - //GENERAL block - int runn; - int eventn; - int lumi; - int bx; - uint64_t orbitn; - uint64_t timest; - - // Generator info - float weight; - float pthat; - - // simulation block - int ngen; - float pxgen[MAXGEN]; - float pygen[MAXGEN]; - float pzgen[MAXGEN]; - float ptgen[MAXGEN]; - float etagen[MAXGEN]; - float phigen[MAXGEN]; - int chagen[MAXGEN]; - float vxgen[MAXGEN]; - float vygen[MAXGEN]; - float vzgen[MAXGEN]; - int pargen[MAXGEN]; - - // GMT data - int bxgmt; - - //DTBX Trigger block - int ndt; - int bxd[MAXDTBX]; - float ptd[MAXDTBX]; - int chad[MAXDTBX]; - float etad[MAXDTBX]; - int etafined[MAXDTBX]; - float phid[MAXDTBX]; - int quald[MAXDTBX]; - int dwd[MAXDTBX]; - int chd[MAXDTBX]; - - //CSC Trigger block - int ncsc; - int bxc[MAXCSC]; - float ptc[MAXCSC]; - int chac[MAXCSC]; - float etac[MAXCSC]; - float phic[MAXCSC]; - int qualc[MAXCSC]; - int dwc[MAXCSC]; - - //RPCb Trigger - int nrpcb; - int bxrb[MAXRPC]; - float ptrb[MAXRPC]; - int charb[MAXRPC]; - float etarb[MAXRPC]; - float phirb[MAXRPC]; - int qualrb[MAXRPC]; - int dwrb[MAXRPC]; - - //RPCf Trigger - int nrpcf; - int bxrf[MAXRPC]; - float ptrf[MAXRPC]; - int charf[MAXRPC]; - float etarf[MAXRPC]; - float phirf[MAXRPC]; - int qualrf[MAXRPC]; - int dwrf[MAXRPC]; - - //Global Muon Trigger - int ngmt; - int bxg[MAXGMT]; - float ptg[MAXGMT]; - int chag[MAXGMT]; - float etag[MAXGMT]; - float phig[MAXGMT]; - int qualg[MAXGMT]; - int detg[MAXGMT]; - int rankg[MAXGMT]; - int isolg[MAXGMT]; - int mipg[MAXGMT]; - int dwg[MAXGMT]; - int idxRPCb[MAXGMT]; - int idxRPCf[MAXGMT]; - int idxDTBX[MAXGMT]; - int idxCSC[MAXGMT]; - - // GT info - uint64_t gttw1[3]; - uint64_t gttw2[3]; - uint64_t gttt[3]; - - //PSB info - int nele; - int bxel[MAXGT]; - float rankel[MAXGT]; - float phiel[MAXGT]; - float etael[MAXGT]; - - int njet; - int bxjet[MAXGT]; - float rankjet[MAXGT]; - float phijet[MAXGT]; - float etajet[MAXGT]; - - //GCT - edm::InputTag gctCenJetsSource_; - edm::InputTag gctForJetsSource_; - edm::InputTag gctTauJetsSource_; - edm::InputTag gctEnergySumsSource_; - edm::InputTag gctIsoEmSource_; - edm::InputTag gctNonIsoEmSource_; - - int gctIsoEmSize; - float gctIsoEmEta[4]; - float gctIsoEmPhi[4]; - float gctIsoEmRnk[4]; - int gctNonIsoEmSize; - float gctNonIsoEmEta[4]; - float gctNonIsoEmPhi[4]; - float gctNonIsoEmRnk[4]; - int gctCJetSize; - float gctCJetEta[4]; - float gctCJetPhi[4]; - float gctCJetRnk[4]; - int gctFJetSize; - float gctFJetEta[4]; - float gctFJetPhi[4]; - float gctFJetRnk[4]; - int gctTJetSize; - float gctTJetEta[4]; - float gctTJetPhi[4]; - float gctTJetRnk[4]; - float gctEtMiss; - float gctEtMissPhi; - float gctEtHad; - float gctEtTot; - int gctHFRingEtSumSize; - float gctHFRingEtSumEta[4]; - float gctHFBitCountsSize; - float gctHFBitCountsEta[4]; - // RCT - - edm::InputTag rctSource_; - int rctRegSize; - float rctRegEta[MAXRCTREG]; - float rctRegPhi[MAXRCTREG]; - float rctRegRnk[MAXRCTREG]; - int rctRegVeto[MAXRCTREG]; - int rctRegBx[MAXRCTREG]; - int rctRegOverFlow[MAXRCTREG]; - int rctRegMip[MAXRCTREG]; - int rctRegFGrain[MAXRCTREG]; - int rctEmSize; - int rctIsIsoEm[MAXRCTREG]; - float rctEmEta[MAXRCTREG]; - float rctEmPhi[MAXRCTREG]; - float rctEmRnk[MAXRCTREG]; - int rctEmBx[MAXRCTREG]; - - // DTTF - edm::InputTag dttfSource_; - - int dttf_phSize; - int dttf_phBx[MAXDTPH]; - int dttf_phWh[MAXDTPH]; - int dttf_phSe[MAXDTPH]; - int dttf_phSt[MAXDTPH]; - float dttf_phAng[MAXDTPH]; - float dttf_phBandAng[MAXDTPH]; - int dttf_phCode[MAXDTPH]; - float dttf_phX[MAXDTPH]; - float dttf_phY[MAXDTPH]; - - int dttf_thSize; - int dttf_thBx[MAXDTTH]; - int dttf_thWh[MAXDTTH]; - int dttf_thSe[MAXDTTH]; - int dttf_thSt[MAXDTTH]; - float dttf_thX[MAXDTTH]; - float dttf_thY[MAXDTTH]; - float dttf_thTheta[MAXDTTH][7]; - int dttf_thCode[MAXDTTH][7]; - - int dttf_trSize; - int dttf_trBx[MAXDTTR]; - int dttf_trTag[MAXDTTR]; - int dttf_trQual[MAXDTTR]; - int dttf_trPtPck[MAXDTTR]; - float dttf_trPtVal[MAXDTTR]; - int dttf_trPhiPck[MAXDTTR]; - float dttf_trPhiVal[MAXDTTR]; - int dttf_trPhiGlob[MAXDTTR]; - int dttf_trChPck[MAXDTTR]; - int dttf_trWh[MAXDTTR]; - int dttf_trSc[MAXDTTR]; - /// - - TFile* m_file; - TTree* m_tree; - - edm::InputTag m_GMTInputTag; - edm::InputTag m_GTEvmInputTag; - edm::InputTag m_GTInputTag; - edm::InputTag m_GeneratorInputTag; - edm::InputTag m_SimulationInputTag; - - bool m_PhysVal; - bool verbose_; - std::string m_outfilename; -}; - -#endif diff --git a/MagneticField/Engine/interface/MagneticFieldHelpers.h b/MagneticField/Engine/interface/MagneticFieldHelpers.h deleted file mode 100644 index 06beec5d40985..0000000000000 --- a/MagneticField/Engine/interface/MagneticFieldHelpers.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef MagneticFieldHelpers_h -#define MagneticFieldHelpers_h - -// #include "CondFormats/RunInfo/interface/RunInfo.h" -// #include "CondFormats/DataRecord/interface/RunSummaryRcd.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/EventSetup.h" - -namespace magneticFieldHelpers { - - /// Return the closer nominal field value (kGauss) to a given magnet current (A) - int closerNominalField(float current) { - int zeroFieldThreshold = 1000; //fixme - float nominalCurrents[5] = {9558,14416,16819,18268,19262} ; //FIXME: replace with correct values... - int nominalFields[5] = {20,30,35,38,40} ; //in kGauss - if(current < zeroFieldThreshold) return 0; - int i=0; - for(;i<4;i++) - { - if(2*current < nominalCurrents[i]+nominalCurrents[i+1] ) - return nominalFields[i]; - } - return nominalFields[i]; - } - -// /// Return the closer nominal field value (kGauss) to the average current stored in the DB. -// int closerNominalField(const RunInfo & runInfo) { -// return closerNominalField(runInfo.m_avg_current); -// } - -// /// Return the closer nominal field value (kGauss) to the average current stored in the DB. -// int closerNominalField(const edm::EventSetup& es) -// { -// edm::ESHandle sum; -// es.get().get(sum); -// return closerNominalField( *sum.product() ); -// } - - -} - -#endif // MagneticFieldHelpers_h diff --git a/MagneticField/VolumeGeometry/interface/RectangularVolumeBounds.h b/MagneticField/VolumeGeometry/interface/RectangularVolumeBounds.h deleted file mode 100644 index 5ef800e81b2bd..0000000000000 --- a/MagneticField/VolumeGeometry/interface/RectangularVolumeBounds.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef RectangularVolumeBounds_H -#define RectangularVolumeBounds_H - -#include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h" - -typedef RectangularPlaneBounds RectangularVolumeBounds; - -#endif diff --git a/Mixing/Base/interface/FixedPUGenerator.h b/Mixing/Base/interface/FixedPUGenerator.h deleted file mode 100644 index 3a0ce92928a71..0000000000000 --- a/Mixing/Base/interface/FixedPUGenerator.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef FIXED_PU_GENERATOR_H -#define FIXED_PU_GENERATOR_H - -/*---------------------------------------------------------------------- - -----------------------------------------------------------------------*/ -#include "Mixing/Base/interface/PUGenerator.h" - -namespace edm -{ - - class FixedPUGenerator: public PUGenerator - { - public: - explicit FixedPUGenerator(int average): nrEvtsPerBunch(average) { } - ~FixedPUGenerator() { } - - private: - virtual unsigned int numberOfEventsPerBunch() const { return nrEvtsPerBunch;} - - unsigned int nrEvtsPerBunch; - }; -}//edm - -#endif diff --git a/Mixing/Base/interface/PUGenerator.h b/Mixing/Base/interface/PUGenerator.h deleted file mode 100644 index dbe7ff5e68425..0000000000000 --- a/Mixing/Base/interface/PUGenerator.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef PU_GENERATOR_H -#define PU_GENERATOR_H - -/*---------------------------------------------------------------------- - -----------------------------------------------------------------------*/ - -namespace edm -{ - - class PUGenerator - { - public: - explicit PUGenerator() { } - virtual ~PUGenerator() { } - virtual unsigned int numberOfEventsPerBunch() const=0; - - private: - }; - -}//edm -#endif