Skip to content

Commit

Permalink
Merge pull request #21910 from gartung/CalibMuon-CSCCalibration-retur…
Browse files Browse the repository at this point in the history 
…ntype-fix

CalibMuon/CSCCalibration: Change return type of ESProducer::produce methods to unique_ptr or shared_ptr.
  • Loading branch information
@cmsbuild
cmsbuild committed Feb 3, 2018
2 parents 0d609a6 + f9e5e84 commit f0fcf65
Show file tree
Hide file tree
Showing 49 changed files with 68 additions and 131 deletions.
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h
View file
Expand Up @@ -25,7 +25,7 @@ class CSCBadChambersConditions: public edm::ESProducer, public edm::EventSetupRe

inline static CSCBadChambers * prefillBadChambers();

typedef const CSCBadChambers * ReturnType;
typedef std::unique_ptr<CSCBadChambers> ReturnType;

ReturnType produceBadChambers(const CSCBadChambersRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h
View file
Expand Up @@ -25,7 +25,7 @@ class CSCBadStripsConditions: public edm::ESProducer, public edm::EventSetupReco

inline static CSCBadStrips * prefillBadStrips();

typedef const CSCBadStrips * ReturnType;
typedef std::unique_ptr<CSCBadStrips> ReturnType;

ReturnType produceBadStrips(const CSCBadStripsRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h
View file
Expand Up @@ -25,7 +25,7 @@ class CSCBadWiresConditions: public edm::ESProducer, public edm::EventSetupRecor

inline static CSCBadWires * prefillBadWires();

typedef const CSCBadWires * ReturnType;
typedef std::unique_ptr<CSCBadWires> ReturnType;

ReturnType produceBadWires(const CSCBadWiresRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCChannelMapperESProducer.h
View file
Expand Up @@ -11,7 +11,7 @@
class CSCChannelMapperESProducer : public edm::ESProducer {

public:
typedef std::shared_ptr<CSCChannelMapperBase> BSP_TYPE;
typedef std::unique_ptr<CSCChannelMapperBase> BSP_TYPE;

CSCChannelMapperESProducer(const edm::ParameterSet&);
~CSCChannelMapperESProducer() override;
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h
View file
Expand Up @@ -25,7 +25,7 @@ class CSCChipSpeedCorrectionDBConditions: public edm::ESProducer, public edm::Ev

inline static CSCDBChipSpeedCorrection * prefillDBChipSpeedCorrection(bool isForMC, std::string dataCorrFileName, float dataOffse);

typedef const CSCDBChipSpeedCorrection * ReturnType;
typedef std::unique_ptr<CSCDBChipSpeedCorrection> ReturnType;

ReturnType produceDBChipSpeedCorrection(const CSCDBChipSpeedCorrectionRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h
View file
Expand Up @@ -24,7 +24,7 @@ class CSCCrosstalkConditions: public edm::ESProducer, public edm::EventSetupReco

static CSCcrosstalk * prefillCrosstalk();

typedef const CSCcrosstalk * ReturnType;
typedef std::unique_ptr<CSCcrosstalk> ReturnType;

ReturnType produceCrosstalk(const CSCcrosstalkRcd&);

Expand Down
5 changes: 1 addition & 4 deletions CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h
View file
Expand Up @@ -25,17 +25,14 @@ class CSCCrosstalkDBConditions: public edm::ESProducer, public edm::EventSetupRe

inline static CSCDBCrosstalk * prefillDBCrosstalk();

typedef const CSCDBCrosstalk * ReturnType;
typedef std::unique_ptr<CSCDBCrosstalk> ReturnType;

ReturnType produceDBCrosstalk(const CSCDBCrosstalkRcd&);

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;


CSCDBCrosstalk *cndbCrosstalk ;

};

#include<fstream>
Expand Down
3 changes: 1 addition & 2 deletions CalibMuon/CSCCalibration/interface/CSCDBL1TPParametersConditions.h
View file
Expand Up @@ -25,14 +25,13 @@ class CSCDBL1TPParametersConditions: public edm::ESProducer, public edm::EventSe

inline static CSCDBL1TPParameters * prefillCSCDBL1TPParameters();

typedef const CSCDBL1TPParameters * ReturnType;
typedef std::unique_ptr<CSCDBL1TPParameters> ReturnType;

ReturnType produceCSCDBL1TPParameters(const CSCDBL1TPParametersRcd&);

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
CSCDBL1TPParameters *CSCl1TPParameters ;

};

Expand Down
5 changes: 2 additions & 3 deletions CalibMuon/CSCCalibration/interface/CSCFakeCrosstalkConditions.h
View file
Expand Up @@ -24,16 +24,15 @@ class CSCFakeCrosstalkConditions: public edm::ESProducer, public edm::EventSetup
float mean,min,minchi;
int seed;long int M;

void prefillCrosstalk();
CSCcrosstalk * prefillCrosstalk();

typedef const CSCcrosstalk * ReturnType;
typedef std::unique_ptr<CSCcrosstalk> ReturnType;

ReturnType produceCrosstalk(const CSCcrosstalkRcd&);

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCcrosstalk *cncrosstalk ;

};

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h
View file
Expand Up @@ -24,7 +24,7 @@ class CSCFakeDBCrosstalk: public edm::ESProducer, public edm::EventSetupRecordIn

inline static CSCDBCrosstalk * prefillDBCrosstalk();

typedef std::shared_ptr<CSCDBCrosstalk> Pointer;
typedef std::unique_ptr<CSCDBCrosstalk> Pointer;

Pointer produceDBCrosstalk(const CSCDBCrosstalkRcd&);

Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalkPopCon.h
View file
Expand Up @@ -24,9 +24,9 @@ class CSCFakeDBCrosstalkPopCon: public edm::ESProducer, public edm::EventSetupRe
float mean,min,minchi;
int seed;long int M;

void prefillDBFakeCrosstalk();
CSCDBCrosstalk * prefillDBFakeCrosstalk();

typedef const CSCDBCrosstalk * ReturnType;
typedef std::unique_ptr<CSCDBCrosstalk> ReturnType;

ReturnType produceDBCrosstalk(const CSCDBCrosstalkRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h
View file
Expand Up @@ -24,7 +24,7 @@ class CSCFakeDBGains: public edm::ESProducer, public edm::EventSetupRecordInterv

inline static CSCDBGains* prefillDBGains();

typedef std::shared_ptr<CSCDBGains> Pointer;
typedef std::unique_ptr<CSCDBGains> Pointer;
Pointer produceDBGains(const CSCDBGainsRcd&);

private:
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeDBGainsPopCon.h
View file
Expand Up @@ -25,9 +25,9 @@ class CSCFakeDBGainsPopCon: public edm::ESProducer, public edm::EventSetupRecord
float mean,min,minchi;
int seed;long int M;

void prefillDBGains();
CSCDBGains * prefillDBGains();

typedef const CSCDBGains * ReturnType;
typedef std::unique_ptr<CSCDBGains> ReturnType;

ReturnType produceDBGains(const CSCDBGainsRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h
View file
Expand Up @@ -24,7 +24,7 @@ class CSCFakeDBNoiseMatrix: public edm::ESProducer, public edm::EventSetupRecord

inline static CSCDBNoiseMatrix * prefillDBNoiseMatrix();

typedef std::shared_ptr<CSCDBNoiseMatrix> Pointer;
typedef std::unique_ptr<CSCDBNoiseMatrix> Pointer;

Pointer produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd&);

Expand Down
3 changes: 1 addition & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h
View file
Expand Up @@ -24,15 +24,14 @@ class CSCFakeDBPedestals: public edm::ESProducer, public edm::EventSetupRecordIn

inline static CSCDBPedestals * prefillDBPedestals();

typedef std::shared_ptr<CSCDBPedestals> Pointer;
typedef std::unique_ptr<CSCDBPedestals> Pointer;

Pointer produceDBPedestals(const CSCDBPedestalsRcd&);

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;

Pointer cndbPedestals ;
};

#include<fstream>
Expand Down
5 changes: 2 additions & 3 deletions CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h
View file
Expand Up @@ -25,16 +25,15 @@ class CSCFakeGainsConditions: public edm::ESProducer, public edm::EventSetupReco
float mean,min,minchi;
int seed;long int M;

void prefillGains();
CSCGains * prefillGains();

typedef const CSCGains * ReturnType;
typedef std::unique_ptr<CSCGains> ReturnType;

ReturnType produceGains(const CSCGainsRcd&);

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCGains *cngains ;

};

Expand Down
5 changes: 2 additions & 3 deletions CalibMuon/CSCCalibration/interface/CSCFakeNoiseMatrixConditions.h
View file
Expand Up @@ -22,14 +22,13 @@ class CSCFakeNoiseMatrixConditions: public edm::ESProducer, public edm::EventSet
CSCFakeNoiseMatrixConditions(const edm::ParameterSet&);
~CSCFakeNoiseMatrixConditions() override;

void prefillNoiseMatrix();
CSCNoiseMatrix * prefillNoiseMatrix();

typedef const CSCNoiseMatrix * ReturnType;
typedef std::unique_ptr<CSCNoiseMatrix> ReturnType;
ReturnType produceNoiseMatrix(const CSCNoiseMatrixRcd&);

private:
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCNoiseMatrix *cnmatrix ;

};

Expand Down
5 changes: 2 additions & 3 deletions CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h
View file
Expand Up @@ -25,16 +25,15 @@ class CSCFakePedestalsConditions: public edm::ESProducer, public edm::EventSetup
float meanped,meanrms;
int seed;long int M;

void prefillPedestals();
CSCPedestals * prefillPedestals();

typedef const CSCPedestals * ReturnType;
typedef std::unique_ptr<CSCPedestals> ReturnType;

ReturnType producePedestals(const CSCPedestalsRcd&);

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCPedestals *cnpedestals ;
};

#endif
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCGainsConditions.h
View file
Expand Up @@ -23,7 +23,7 @@ class CSCGainsConditions: public edm::ESProducer, public edm::EventSetupRecordIn

static CSCGains * prefillGains();

typedef const CSCGains * ReturnType;
typedef std::unique_ptr<CSCGains> ReturnType;

ReturnType produceGains(const CSCGainsRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h
View file
Expand Up @@ -25,7 +25,7 @@ class CSCGainsDBConditions: public edm::ESProducer, public edm::EventSetupRecord

inline static CSCDBGains * prefillDBGains();

typedef const CSCDBGains * ReturnType;
typedef std::unique_ptr<CSCDBGains> ReturnType;

ReturnType produceDBGains(const CSCDBGainsRcd&);

Expand Down
3 changes: 1 addition & 2 deletions CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h
View file
Expand Up @@ -25,14 +25,13 @@ class CSCGasGainCorrectionDBConditions: public edm::ESProducer, public edm::Even

inline static CSCDBGasGainCorrection * prefillDBGasGainCorrection(bool isForMC, std::string dataCorrFileName);

typedef const CSCDBGasGainCorrection * ReturnType;
typedef std::unique_ptr<CSCDBGasGainCorrection> ReturnType;

ReturnType produceDBGasGainCorrection(const CSCDBGasGainCorrectionRcd&);

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCDBGasGainCorrection *cndbGasGainCorr ;

//Flag for determining if this is for setting MC or data corrections
bool isForMC;
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCIndexerESProducer.h
View file
Expand Up @@ -11,7 +11,7 @@
class CSCIndexerESProducer : public edm::ESProducer {

public:
typedef std::shared_ptr<CSCIndexerBase> BSP_TYPE;
typedef std::unique_ptr<CSCIndexerBase> BSP_TYPE;

CSCIndexerESProducer(const edm::ParameterSet&);
~CSCIndexerESProducer() override;
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h
View file
Expand Up @@ -25,7 +25,7 @@ class CSCL1TPParametersConditions: public edm::ESProducer, public edm::EventSetu

inline static CSCL1TPParameters * prefillCSCL1TPParameters();

typedef const CSCL1TPParameters * ReturnType;
typedef std::unique_ptr<CSCL1TPParameters> ReturnType;

ReturnType produceCSCL1TPParameters(const CSCL1TPParametersRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCNoiseMatrixConditions.h
View file
Expand Up @@ -24,7 +24,7 @@ class CSCNoiseMatrixConditions: public edm::ESProducer, public edm::EventSetupRe
static CSCNoiseMatrix * prefillNoiseMatrix();


typedef const CSCNoiseMatrix * ReturnType;
typedef std::unique_ptr<CSCNoiseMatrix> ReturnType;

ReturnType produceNoiseMatrix(const CSCNoiseMatrixRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h
View file
Expand Up @@ -24,7 +24,7 @@ class CSCNoiseMatrixDBConditions: public edm::ESProducer, public edm::EventSetup

inline static CSCDBNoiseMatrix * prefillDBNoiseMatrix();

typedef const CSCDBNoiseMatrix * ReturnType;
typedef std::unique_ptr<CSCDBNoiseMatrix> ReturnType;

ReturnType produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd&);

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h
View file
Expand Up @@ -24,7 +24,7 @@ class CSCPedestalsDBConditions: public edm::ESProducer, public edm::EventSetupRe

inline static CSCDBPedestals * prefillDBPedestals();

typedef const CSCDBPedestals * ReturnType;
typedef std::unique_ptr<CSCDBPedestals> ReturnType;

ReturnType produceDBPedestals(const CSCDBPedestalsRcd&);

Expand Down
6 changes: 1 addition & 5 deletions CalibMuon/CSCCalibration/plugins/CSCBadChambersConditions.cc
View file
Expand Up @@ -10,7 +10,6 @@ CSCBadChambersConditions::CSCBadChambersConditions(const edm::ParameterSet& iCon
{
//the following line is needed to tell the framework what
// data is being produced
cndbBadChambers = prefillBadChambers();
setWhatProduced(this,&CSCBadChambersConditions::produceBadChambers);
findingRecord<CSCBadChambersRcd>();
//now do what ever other initialization is needed
Expand All @@ -22,7 +21,6 @@ CSCBadChambersConditions::~CSCBadChambersConditions()

// do anything here that needs to be done at desctruction time
// (e.g. close files, deallocate resources etc.)
delete cndbBadChambers;
}


Expand All @@ -35,9 +33,7 @@ CSCBadChambersConditions::ReturnType
CSCBadChambersConditions::produceBadChambers(const CSCBadChambersRcd& iRecord)
{
//need a new object so to not be deleted at exit
CSCBadChambers* mydata=new CSCBadChambers( *cndbBadChambers );
return mydata;

return CSCBadChambersConditions::ReturnType( prefillBadChambers());
}

void CSCBadChambersConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
Expand Down
6 changes: 1 addition & 5 deletions CalibMuon/CSCCalibration/plugins/CSCBadStripsConditions.cc
View file
Expand Up @@ -10,7 +10,6 @@ CSCBadStripsConditions::CSCBadStripsConditions(const edm::ParameterSet& iConfig)
{
//the following line is needed to tell the framework what
// data is being produced
cndbBadStrips = prefillBadStrips();
setWhatProduced(this,&CSCBadStripsConditions::produceBadStrips);
findingRecord<CSCBadStripsRcd>();
//now do what ever other initialization is needed
Expand All @@ -22,7 +21,6 @@ CSCBadStripsConditions::~CSCBadStripsConditions()

// do anything here that needs to be done at desctruction time
// (e.g. close files, deallocate resources etc.)
delete cndbBadStrips;
}


Expand All @@ -35,9 +33,7 @@ CSCBadStripsConditions::ReturnType
CSCBadStripsConditions::produceBadStrips(const CSCBadStripsRcd& iRecord)
{
//need a new object so to not be deleted at exit
CSCBadStrips* mydata=new CSCBadStrips( *cndbBadStrips );
return mydata;

return CSCBadStripsConditions::ReturnType( prefillBadStrips());
}

void CSCBadStripsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
Expand Down
5 changes: 1 addition & 4 deletions CalibMuon/CSCCalibration/plugins/CSCBadWiresConditions.cc
View file
Expand Up @@ -10,7 +10,6 @@ CSCBadWiresConditions::CSCBadWiresConditions(const edm::ParameterSet& iConfig)
{
//the following line is needed to tell the framework what
// data is being produced
cndbBadWires = prefillBadWires();
setWhatProduced(this,&CSCBadWiresConditions::produceBadWires);
findingRecord<CSCBadWiresRcd>();
//now do what ever other initialization is needed
Expand All @@ -22,7 +21,6 @@ CSCBadWiresConditions::~CSCBadWiresConditions()

// do anything here that needs to be done at desctruction time
// (e.g. close files, deallocate resources etc.)
delete cndbBadWires;
}


Expand All @@ -35,8 +33,7 @@ CSCBadWiresConditions::ReturnType
CSCBadWiresConditions::produceBadWires(const CSCBadWiresRcd& iRecord)
{
//need a new object so to not be deleted at exit
CSCBadWires* mydata=new CSCBadWires( *cndbBadWires );
return mydata;
return CSCBadWiresConditions::ReturnType( prefillBadWires());

}

Expand Down

0 comments on commit f0fcf65

Please sign in to comment.