Skip to content

Commit 0407562

Browse files
archiesharmaarchiesharma
committed
Merge pull request #8 from cms-sw/CMSSW_7_6_X
Private pull request to make branch UpdCodePortingforGEMs up to date
2 parents ed026b8 + 4b612a8 commit 0407562

File tree

136 files changed

+18999
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+18999
-329
lines changed

‎Alignment/MillePedeAlignmentAlgorithm/scripts/mps_runPede_rfcp_template.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
#temporary fix (?):
88
#unset PYTHONHOME
99

10+
cd $CMSSW_BASE/src
11+
eval `scramv1 runtime -sh`
12+
cd -
13+
1014
# these defaults will be overwritten by MPS
1115
RUNDIR=$HOME/scratch0/some/path
1216
MSSDIR=/castor/cern.ch/user/u/username/another/path

‎CondCore/EcalPlugins/plugins/BuildFile.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<use name="boost_regex"/>
1919
<flags EDM_PLUGIN="1"/>
2020
</library>
21-
<library file="EcalPulseCovariancesPyWrapper.cc" name="EcalPulseCovariancesPyInterface">
21+
<library file="EcalPulseSymmCovariancesPyWrapper.cc" name="EcalPulseSymmCovariancesPyInterface">
2222
<use name="CondCore/Utilities"/>
2323
<use name="CondFormats/EcalObjects"/>
2424
<use name="CondTools/Ecal"/>

CondCore/EcalPlugins/plugins/EcalPulseCovariancesPyWrapper.cc renamed to CondCore/EcalPlugins/plugins/EcalPulseSymmCovariancesPyWrapper.cc

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "CondFormats/EcalObjects/interface/EcalPulseShapes.h"
2-
#include "CondFormats/EcalObjects/interface/EcalPulseCovariances.h"
3-
#include "CondTools/Ecal/interface/EcalPulseCovariancesXMLTranslator.h"
2+
#include "CondFormats/EcalObjects/interface/EcalPulseSymmCovariances.h"
3+
#include "CondTools/Ecal/interface/EcalPulseSymmCovariancesXMLTranslator.h"
44
#include "CondTools/Ecal/interface/EcalCondHeader.h"
55
#include "TH2F.h"
66
#include "TCanvas.h"
@@ -29,7 +29,7 @@
2929

3030
namespace {
3131
struct Printer {
32-
void doit(EcalPulseCovariance const & item) {
32+
void doit(EcalPulseSymmCovariance const & item) {
3333
for(int s = 0; s<EcalPulseShape::TEMPLATESAMPLES; ++s)
3434
ss << item.val(THERAW,s);
3535
ss << " ";
@@ -45,35 +45,35 @@ namespace cond {
4545
enum Quantity { sample_0=1, sample_1=2, sample_2=3, sample_3=4, sample_4=5, sample_5=6, sample_6=7, sample_7=8, sample_8=9, sample_9=10, sample_10=11, sample_11=12 };
4646
enum How { singleChannel, bySuperModule, all};
4747

48-
float average(EcalPulseCovariances const & pulseshapes, Quantity q) {
48+
float average(EcalPulseSymmCovariances const & pulseshapes, Quantity q) {
4949
return std::accumulate(
50-
boost::make_transform_iterator(pulseshapes.barrelItems().begin(),bind(&EcalPulseCovariance::val,_1,THERAW,q-1)),
51-
boost::make_transform_iterator(pulseshapes.barrelItems().end(),bind(&EcalPulseCovariance::val,_1,THERAW,q-1)),
50+
boost::make_transform_iterator(pulseshapes.barrelItems().begin(),bind(&EcalPulseSymmCovariance::val,_1,THERAW,q-1)),
51+
boost::make_transform_iterator(pulseshapes.barrelItems().end(),bind(&EcalPulseSymmCovariance::val,_1,THERAW,q-1)),
5252
0.)/float(pulseshapes.barrelItems().size());
5353
}
5454

55-
void extractAverage(EcalPulseCovariances const & pulseshapes, Quantity q, std::vector<int> const &, std::vector<float> & result) {
55+
void extractAverage(EcalPulseSymmCovariances const & pulseshapes, Quantity q, std::vector<int> const &, std::vector<float> & result) {
5656
result.resize(1);
5757
result[0] = average(pulseshapes,q);
5858
}
5959

60-
void extractSuperModules(EcalPulseCovariances const & pulseshapes, Quantity q, std::vector<int> const & which, std::vector<float> & result) {
60+
void extractSuperModules(EcalPulseSymmCovariances const & pulseshapes, Quantity q, std::vector<int> const & which, std::vector<float> & result) {
6161
// bho...
6262
}
6363

64-
void extractSingleChannel(EcalPulseCovariances const & pulseshapes, Quantity q, std::vector<int> const & which, std::vector<float> & result) {
64+
void extractSingleChannel(EcalPulseSymmCovariances const & pulseshapes, Quantity q, std::vector<int> const & which, std::vector<float> & result) {
6565
for (unsigned int i=0; i<which.size();i++) {
6666
// absolutely arbitraty
6767
if ((unsigned int) (which[i])< pulseshapes.barrelItems().size())
6868
result.push_back( pulseshapes.barrelItems()[which[i]].val(THERAW,q-1));
6969
}
7070
}
7171

72-
typedef boost::function<void(EcalPulseCovariances const & pulseshapes, Quantity q, std::vector<int> const & which, std::vector<float> & result)> PulseCovarianceExtractor;
72+
typedef boost::function<void(EcalPulseSymmCovariances const & pulseshapes, Quantity q, std::vector<int> const & which, std::vector<float> & result)> PulseSymmCovarianceExtractor;
7373
}
7474

7575
template<>
76-
struct ExtractWhat<EcalPulseCovariances> {
76+
struct ExtractWhat<EcalPulseSymmCovariances> {
7777

7878
ecalpulsecovariance::Quantity m_quantity;
7979
ecalpulsecovariance::How m_how;
@@ -91,19 +91,19 @@ namespace cond {
9191

9292

9393
template<>
94-
class ValueExtractor<EcalPulseCovariances>: public BaseValueExtractor<EcalPulseCovariances> {
94+
class ValueExtractor<EcalPulseSymmCovariances>: public BaseValueExtractor<EcalPulseSymmCovariances> {
9595
public:
9696

97-
static ecalpulsecovariance::PulseCovarianceExtractor & extractor(ecalpulsecovariance::How how) {
98-
static ecalpulsecovariance::PulseCovarianceExtractor fun[3] = {
99-
ecalpulsecovariance::PulseCovarianceExtractor(ecalpulsecovariance::extractSingleChannel),
100-
ecalpulsecovariance::PulseCovarianceExtractor(ecalpulsecovariance::extractSuperModules),
101-
ecalpulsecovariance::PulseCovarianceExtractor(ecalpulsecovariance::extractAverage)
97+
static ecalpulsecovariance::PulseSymmCovarianceExtractor & extractor(ecalpulsecovariance::How how) {
98+
static ecalpulsecovariance::PulseSymmCovarianceExtractor fun[3] = {
99+
ecalpulsecovariance::PulseSymmCovarianceExtractor(ecalpulsecovariance::extractSingleChannel),
100+
ecalpulsecovariance::PulseSymmCovarianceExtractor(ecalpulsecovariance::extractSuperModules),
101+
ecalpulsecovariance::PulseSymmCovarianceExtractor(ecalpulsecovariance::extractAverage)
102102
};
103103
return fun[how];
104104
}
105105

106-
typedef EcalPulseCovariances Class;
106+
typedef EcalPulseSymmCovariances Class;
107107
typedef ExtractWhat<Class> What;
108108
static What what() { return What();}
109109

@@ -129,45 +129,45 @@ namespace cond {
129129

130130
template<>
131131
std::string
132-
PayLoadInspector<EcalPulseCovariances>::dump() const {
132+
PayLoadInspector<EcalPulseSymmCovariances>::dump() const {
133133
std::stringstream ss;
134134
EcalCondHeader header;
135-
ss<<EcalPulseCovariancesXMLTranslator::dumpXML(header,object());
135+
ss<<EcalPulseSymmCovariancesXMLTranslator::dumpXML(header,object());
136136
return ss.str();
137137
} // dump
138138

139139

140-
class EcalPulseCovariancesHelper: public EcalPyWrapperHelper<EcalPulseCovariance>{
140+
class EcalPulseSymmCovariancesHelper: public EcalPyWrapperHelper<EcalPulseSymmCovariance>{
141141
public:
142-
EcalPulseCovariancesHelper():EcalPyWrapperHelper<EcalObject>(EcalPulseShape::TEMPLATESAMPLES){}
142+
EcalPulseSymmCovariancesHelper():EcalPyWrapperHelper<EcalObject>(EcalPulseShape::TEMPLATESAMPLES){}
143143
protected:
144-
typedef EcalPulseCovariance EcalObject;
145-
type_vValues getValues( const std::vector<EcalPulseCovariance> & vItems) override
144+
typedef EcalPulseSymmCovariance EcalObject;
145+
type_vValues getValues( const std::vector<EcalPulseSymmCovariance> & vItems) override
146146
{
147147
type_vValues vValues(total_values);
148148

149149
for(int s = 0; s<EcalPulseShape::TEMPLATESAMPLES; ++s) vValues[s].first = Form("sample_0.vs.sample_%d",s);
150150

151151
//get info:
152-
for(std::vector<EcalPulseCovariance>::const_iterator iItems = vItems.begin(); iItems != vItems.end(); ++iItems) {
152+
for(std::vector<EcalPulseSymmCovariance>::const_iterator iItems = vItems.begin(); iItems != vItems.end(); ++iItems) {
153153
for(int s = 0; s<EcalPulseShape::TEMPLATESAMPLES; ++s) vValues[s].second = iItems->val(THERAW,s);
154154
}
155155
return vValues;
156156
}
157157
};
158158

159159
template<>
160-
std::string PayLoadInspector<EcalPulseCovariances>::summary() const {
160+
std::string PayLoadInspector<EcalPulseSymmCovariances>::summary() const {
161161
std::stringstream ss;
162-
EcalPulseCovariancesHelper helper;
162+
EcalPulseSymmCovariancesHelper helper;
163163
ss << helper.printBarrelsEndcaps(object().barrelItems(), object().endcapItems());
164164
return ss.str();
165165
} // summary
166166

167167

168168
// return the real name of the file including extension...
169169
template<>
170-
std::string PayLoadInspector<EcalPulseCovariances>::plot(std::string const & filename,
170+
std::string PayLoadInspector<EcalPulseSymmCovariances>::plot(std::string const & filename,
171171
std::string const &,
172172
std::vector<int> const&,
173173
std::vector<float> const& ) const {
@@ -213,7 +213,7 @@ namespace cond {
213213
float y = -1 - ieta;
214214
if(sign == 1) y = ieta;
215215
for(int s = 0; s<EcalPulseShape::TEMPLATESAMPLES; ++s) {
216-
barrel_s[s]->Fill(iphi, y, fabs(object()[id.rawId()].covval[THERAW][s]));
216+
barrel_s[s]->Fill(iphi, y, fabs(object()[id.rawId()].val(THERAW,s)));
217217
}
218218
} // iphi
219219
} // ieta
@@ -224,11 +224,11 @@ namespace cond {
224224
EEDetId id(ix+1,iy+1,thesign);
225225
if (thesign==1) {
226226
for(int s = 0; s<EcalPulseShape::TEMPLATESAMPLES; ++s)
227-
endc_p_s[s]->Fill(ix+1,iy+1,fabs(object()[id.rawId()].covval[THERAW][s]));
227+
endc_p_s[s]->Fill(ix+1,iy+1,fabs(object()[id.rawId()].val(THERAW,s)));
228228
}
229229
else {
230230
for(int s = 0; s<EcalPulseShape::TEMPLATESAMPLES; ++s)
231-
endc_m_s[s]->Fill(ix+1,iy+1,fabs(object()[id.rawId()].covval[THERAW][s]));
231+
endc_m_s[s]->Fill(ix+1,iy+1,fabs(object()[id.rawId()].val(THERAW,s)));
232232
}
233233
} // iy
234234
} // ix
@@ -322,7 +322,7 @@ namespace cond {
322322

323323
namespace condPython {
324324
template<>
325-
void defineWhat<EcalPulseCovariances>() {
325+
void defineWhat<EcalPulseSymmCovariances>() {
326326
using namespace boost::python;
327327
enum_<cond::ecalpulsecovariance::Quantity>("Quantity")
328328
.value("sample_0",cond::ecalpulsecovariance::sample_0)
@@ -342,7 +342,7 @@ namespace condPython {
342342
.value("all",cond::ecalpulsecovariance::all)
343343
;
344344

345-
typedef cond::ExtractWhat<EcalPulseCovariances> What;
345+
typedef cond::ExtractWhat<EcalPulseSymmCovariances> What;
346346
class_<What>("What",init<>())
347347
.def("set_quantity",&What::set_quantity)
348348
.def("set_how",&What::set_how)
@@ -356,4 +356,4 @@ namespace condPython {
356356

357357

358358

359-
PYTHON_WRAPPER(EcalPulseCovariances,EcalPulseCovariances);
359+
PYTHON_WRAPPER(EcalPulseSymmCovariances,EcalPulseSymmCovariances);

‎CondCore/EcalPlugins/src/plugin.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@
154154
#include "CondFormats/EcalObjects/interface/EcalPulseCovariances.h"
155155
#include "CondFormats/DataRecord/interface/EcalPulseCovariancesRcd.h"
156156

157+
#include "CondFormats/EcalObjects/interface/EcalPulseSymmCovariances.h"
158+
#include "CondFormats/DataRecord/interface/EcalPulseSymmCovariancesRcd.h"
159+
157160
REGISTER_PLUGIN(EcalPedestalsRcd,EcalPedestals);
158161
REGISTER_PLUGIN(EcalWeightXtalGroupsRcd,EcalWeightXtalGroups);
159162
REGISTER_PLUGIN(EcalTBWeightsRcd,EcalTBWeights);
@@ -210,3 +213,4 @@ REGISTER_PLUGIN(EcalTimeBiasCorrectionsRcd, EcalTimeBiasCorrections);
210213
REGISTER_PLUGIN(EcalSamplesCorrelationRcd, EcalSamplesCorrelation);
211214
REGISTER_PLUGIN(EcalPulseShapesRcd,EcalPulseShapes);
212215
REGISTER_PLUGIN(EcalPulseCovariancesRcd,EcalPulseCovariances);
216+
REGISTER_PLUGIN(EcalPulseSymmCovariancesRcd,EcalPulseSymmCovariances);

‎CondCore/Utilities/src/CondDBFetch.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ namespace cond {
131131
FETCH_PAYLOAD_CASE( EcalPulseShape )
132132
FETCH_PAYLOAD_CASE( EcalCondObjectContainer<EcalPulseCovariance> )
133133
FETCH_PAYLOAD_CASE( EcalPulseCovariance )
134+
FETCH_PAYLOAD_CASE( EcalCondObjectContainer<EcalPulseSymmCovariance> )
135+
FETCH_PAYLOAD_CASE( EcalPulseSymmCovariance )
134136
FETCH_PAYLOAD_CASE( FileBlob )
135137
FETCH_PAYLOAD_CASE( GBRForest )
136138
FETCH_PAYLOAD_CASE( GBRForestD )

‎CondCore/Utilities/src/CondDBImport.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ namespace cond {
146146
IMPORT_PAYLOAD_CASE( EcalPulseShape )
147147
IMPORT_PAYLOAD_CASE( EcalCondObjectContainer<EcalPulseCovariance> )
148148
IMPORT_PAYLOAD_CASE( EcalPulseCovariance )
149+
IMPORT_PAYLOAD_CASE( EcalCondObjectContainer<EcalPulseSymmCovariance> )
150+
IMPORT_PAYLOAD_CASE( EcalPulseSymmCovariance )
149151
IMPORT_PAYLOAD_CASE( FileBlob )
150152
IMPORT_PAYLOAD_CASE( GBRForest )
151153
IMPORT_PAYLOAD_CASE( GBRForestD )

‎CondCore/Utilities/src/CondFormats.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
#include "CondFormats/EcalObjects/interface/EcalSamplesCorrelation.h"
6060
#include "CondFormats/EcalObjects/interface/EcalPulseShapes.h"
6161
#include "CondFormats/EcalObjects/interface/EcalPulseCovariances.h"
62+
#include "CondFormats/EcalObjects/interface/EcalPulseSymmCovariances.h"
6263
#include "CondFormats/EgammaObjects/interface/GBRForest.h"
6364
#include "CondFormats/EgammaObjects/interface/GBRForestD.h"
6465
#include "CondFormats/HcalObjects/interface/AbsOOTPileupCorrection.h"

‎CondFormats/DataRecord/interface/EcalPulseSymmCovariancesRcd.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef ECALPULSESYMMCOVARIANCESRCD_H
2+
#define ECALPULSESYMMCOVARIANCESRCD_H
3+
4+
#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
5+
class EcalPulseSymmCovariancesRcd : public edm::eventsetup::EventSetupRecordImplementation<EcalPulseSymmCovariancesRcd> {};
6+
#endif

‎CondFormats/DataRecord/src/EcalPulseSymmCovariancesRcd.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "CondFormats/DataRecord/interface/EcalPulseSymmCovariancesRcd.h"
2+
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
3+
4+
EVENTSETUP_RECORD_REG(EcalPulseSymmCovariancesRcd);

‎CondFormats/EcalObjects/interface/EcalPulseSymmCovariances.h‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#ifndef EcalPulseSymmCovariances_h
2+
#define EcalPulseSymmCovariances_h
3+
4+
#include "CondFormats/Serialization/interface/Serializable.h"
5+
6+
#include "CondFormats/EcalObjects/interface/EcalPulseShapes.h"
7+
#include "CondFormats/EcalObjects/interface/EcalCondObjectContainer.h"
8+
9+
struct EcalPulseSymmCovariance {
10+
11+
public:
12+
13+
EcalPulseSymmCovariance();
14+
15+
float covval[EcalPulseShape::TEMPLATESAMPLES*(EcalPulseShape::TEMPLATESAMPLES+1)/2];
16+
17+
float val(int i, int j) const {
18+
19+
int k=-1;
20+
if(j >= i) k = j + (EcalPulseShape::TEMPLATESAMPLES-1)*i;
21+
else k = i + (EcalPulseShape::TEMPLATESAMPLES-1)*j;
22+
return covval[k];
23+
24+
}
25+
26+
COND_SERIALIZABLE;
27+
28+
};
29+
30+
typedef EcalCondObjectContainer<EcalPulseSymmCovariance> EcalPulseSymmCovariancesMap;
31+
typedef EcalPulseSymmCovariancesMap::const_iterator EcalPulseSymmCovariancesMapIterator;
32+
typedef EcalPulseSymmCovariancesMap EcalPulseSymmCovariances;
33+
34+
#endif

0 commit comments

Comments
 (0)