Skip to content

Commit c44be9a

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#35876 from michalszleper/michals_o2o
OMTF o2o upgrade
2 parents 81ade48 + 05dd25a commit c44be9a

27 files changed

+717
-14
lines changed

‎CondCore/L1TPlugins/src/UpgradeRecords2.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
#include "CondFormats/DataRecord/interface/L1TMuonEndCapForestRcd.h"
1515
#include "CondFormats/DataRecord/interface/L1TMuonEndCapForestO2ORcd.h"
1616

17+
#include "CondFormats/L1TObjects/interface/L1TMuonOverlapFwVersion.h"
18+
#include "CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionRcd.h"
19+
#include "CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionO2ORcd.h"
1720
#include "CondFormats/L1TObjects/interface/L1TMuonOverlapParams.h"
1821
#include "CondFormats/DataRecord/interface/L1TMuonOverlapParamsRcd.h"
1922
#include "CondFormats/DataRecord/interface/L1TMuonOverlapParamsO2ORcd.h"
@@ -32,13 +35,15 @@ REGISTER_PLUGIN(L1TMuonEndcapParamsRcd, L1TMuonEndCapParams); // Temporary copy
3235

3336
REGISTER_PLUGIN(L1TMuonEndCapParamsRcd, L1TMuonEndCapParams);
3437
REGISTER_PLUGIN(L1TMuonEndCapForestRcd, L1TMuonEndCapForest);
38+
REGISTER_PLUGIN(L1TMuonOverlapFwVersionRcd, L1TMuonOverlapFwVersion);
3539
REGISTER_PLUGIN(L1TMuonOverlapParamsRcd, L1TMuonOverlapParams);
3640
REGISTER_PLUGIN(L1TMuonBarrelParamsRcd, L1TMuonBarrelParams);
3741
REGISTER_PLUGIN(L1TMuonBarrelKalmanParamsRcd, L1TMuonBarrelKalmanParams);
3842
REGISTER_PLUGIN(L1TMuonGlobalParamsRcd, L1TMuonGlobalParams);
3943

4044
REGISTER_PLUGIN(L1TMuonEndCapParamsO2ORcd, L1TMuonEndCapParams);
4145
REGISTER_PLUGIN(L1TMuonEndCapForestO2ORcd, L1TMuonEndCapForest);
46+
REGISTER_PLUGIN(L1TMuonOverlapFwVersionO2ORcd, L1TMuonOverlapFwVersion);
4247
REGISTER_PLUGIN(L1TMuonOverlapParamsO2ORcd, L1TMuonOverlapParams);
4348
REGISTER_PLUGIN(L1TMuonBarrelParamsO2ORcd, L1TMuonBarrelParams);
4449
REGISTER_PLUGIN(L1TMuonGlobalParamsO2ORcd, L1TMuonGlobalParams);

‎CondCore/Utilities/plugins/Module_2XML.cc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ PAYLOAD_2XML_MODULE(pluginUtilities_payload2xml) {
195195
PAYLOAD_2XML_CLASS(L1TMuonEndCapParams);
196196
PAYLOAD_2XML_CLASS(L1TMuonGlobalParams);
197197
PAYLOAD_2XML_CLASS(L1TMuonOverlapParams);
198+
PAYLOAD_2XML_CLASS(L1TMuonOverlapFwVersion);
198199
PAYLOAD_2XML_CLASS(L1TUtmAlgorithm);
199200
PAYLOAD_2XML_CLASS(L1TUtmBin);
200201
PAYLOAD_2XML_CLASS(L1TUtmCondition);
@@ -205,6 +206,8 @@ PAYLOAD_2XML_MODULE(pluginUtilities_payload2xml) {
205206
PAYLOAD_2XML_CLASS(L1TUtmTriggerMenu);
206207
PAYLOAD_2XML_CLASS(L1TriggerKey);
207208
PAYLOAD_2XML_CLASS(L1TriggerKeyList);
209+
PAYLOAD_2XML_CLASS(L1TriggerKeyExt);
210+
PAYLOAD_2XML_CLASS(L1TriggerKeyListExt);
208211
PAYLOAD_2XML_CLASS(LHCInfo);
209212
PAYLOAD_2XML_CLASS(METCorrectorParametersCollection);
210213
PAYLOAD_2XML_CLASS(MEtXYcorrectParametersCollection);

‎CondCore/Utilities/src/CondFormats.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@
250250
#include "CondFormats/L1TObjects/interface/L1TMuonEndCapParams.h"
251251
#include "CondFormats/L1TObjects/interface/L1TMuonGlobalParams.h"
252252
#include "CondFormats/L1TObjects/interface/L1TMuonOverlapParams.h"
253+
#include "CondFormats/L1TObjects/interface/L1TMuonOverlapFwVersion.h"
253254
#include "CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h"
254255
#include "CondFormats/L1TObjects/interface/L1TUtmBin.h"
255256
#include "CondFormats/L1TObjects/interface/L1TUtmCondition.h"
@@ -263,6 +264,8 @@
263264
#include "CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetosFract.h"
264265
#include "CondFormats/L1TObjects/interface/L1TriggerKey.h"
265266
#include "CondFormats/L1TObjects/interface/L1TriggerKeyList.h"
267+
#include "CondFormats/L1TObjects/interface/L1TriggerKeyExt.h"
268+
#include "CondFormats/L1TObjects/interface/L1TriggerKeyListExt.h"
266269
#include "CondFormats/PhysicsToolsObjects/interface/Histogram3D.h"
267270
#include "CondFormats/PhysicsToolsObjects/interface/PerformancePayload.h"
268271
#include "CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTFormula.h"

‎CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionO2ORcd.h‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#ifndef L1TMTFOverlapFwVersionRcd_L1TMuonOverlapFwVersionO2ORcd_h
2+
#define L1TMTFOverlapFwVersionRcd_L1TMuonOverlapFwVersionO2ORcd_h
3+
// -*- C++ -*-
4+
//
5+
// Package: CondFormats/DataRecord
6+
// Class : L1TMuonOverlapFwVersionRcd
7+
//
8+
/**\class L1TMuonOverlapFwVersionRcd L1TMuonOverlapFwVersionRcd.h CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionRcd.h
9+
10+
Description: [one line class summary]
11+
12+
Usage:
13+
<usage>
14+
15+
*/
16+
//
17+
// Author: Michal Szleper
18+
// Created: Wed, 20 Oct 2020 13:55:50 GMT
19+
//
20+
21+
#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
22+
#include "CondFormats/DataRecord/interface/L1TriggerKeyListExtRcd.h"
23+
#include "CondFormats/DataRecord/interface/L1TriggerKeyExtRcd.h"
24+
#include "CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionRcd.h"
25+
class L1TMuonOverlapFwVersionO2ORcd
26+
: public edm::eventsetup::DependentRecordImplementation<
27+
L1TMuonOverlapFwVersionO2ORcd,
28+
edm::mpl::Vector<L1TriggerKeyListExtRcd, L1TriggerKeyExtRcd, L1TMuonOverlapFwVersionRcd> > {};
29+
30+
#endif

‎CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionRcd.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#ifndef L1TMTFOverlapFwVersionRcd_L1TMTFOverlapFwVersionRcd_h
2+
#define L1TMTFOverlapFwVersionRcd_L1TMTFOverlapFwVersionRcd_h
3+
// -*- C++ -*-
4+
//
5+
// Package: CondFormats/DataRecord
6+
// Class : L1TMuonOverlapFwVersionRcd
7+
//
8+
/**\class L1TMuonOverlapFwVersionRcd L1TMuonOverlapFwVersionRcd.h CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionRcd.h
9+
10+
Description: [one line class summary]
11+
12+
Usage:
13+
<usage>
14+
15+
*/
16+
//
17+
// Author: Michal Szleper
18+
// Created: Wed, 20 May 2020 13:50:35 GMT
19+
//
20+
21+
#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
22+
23+
class L1TMuonOverlapFwVersionRcd : public edm::eventsetup::EventSetupRecordImplementation<L1TMuonOverlapFwVersionRcd> {
24+
};
25+
26+
#endif

‎CondFormats/DataRecord/src/L1TMuonOverlapFwVersionO2ORcd.cc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// -*- C++ -*-
2+
//
3+
// Package: CondFormats/DataRecord
4+
// Class : L1TMuonOverlapFwVersionRcd
5+
//
6+
// Implementation:
7+
// [Notes on implementation]
8+
//
9+
// Author: Michal Szleper
10+
// Created: Wed, 20 Oct 2020 13:58:35 GMT
11+
12+
#include "CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionO2ORcd.h"
13+
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
14+
15+
EVENTSETUP_RECORD_REG(L1TMuonOverlapFwVersionO2ORcd);

‎CondFormats/DataRecord/src/L1TMuonOverlapFwVersionRcd.cc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// -*- C++ -*-
2+
//
3+
// Package: CondFormats/DataRecord
4+
// Class : L1TMuonOverlapFwVersionRcd
5+
//
6+
// Implementation:
7+
// [Notes on implementation]
8+
//
9+
// Author: Michal Szleper
10+
// Created: Wed, 20 Oct 2020 13:57:35 GMT
11+
12+
#include "CondFormats/DataRecord/interface/L1TMuonOverlapFwVersionRcd.h"
13+
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
14+
15+
EVENTSETUP_RECORD_REG(L1TMuonOverlapFwVersionRcd);

‎CondFormats/L1TObjects/interface/L1TMuonOverlapFwVersion.h‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#ifndef L1TMuonOverlapFwVersion_h
2+
#define L1TMuonOverlapFwVersion_h
3+
4+
#include <memory>
5+
#include <iostream>
6+
#include <vector>
7+
#include <cmath>
8+
9+
#include "CondFormats/Serialization/interface/Serializable.h"
10+
#include "CondFormats/L1TObjects/interface/LUT.h"
11+
12+
///////////////////////////////////////
13+
///////////////////////////////////////
14+
class L1TMuonOverlapFwVersion {
15+
public:
16+
L1TMuonOverlapFwVersion() {
17+
algorithmVer_ = 0x110;
18+
layersVer_ = 0x6;
19+
patternsVer_ = 0x3;
20+
synthDate_ = "2018-9-18 21:26:2";
21+
}
22+
L1TMuonOverlapFwVersion(unsigned algoV, unsigned layersV, unsigned patternsV, std::string sDate) {
23+
algorithmVer_ = algoV;
24+
layersVer_ = layersV;
25+
patternsVer_ = patternsV;
26+
synthDate_ = sDate;
27+
}
28+
~L1TMuonOverlapFwVersion() {}
29+
30+
unsigned algoVersion() const { return algorithmVer_; }
31+
unsigned layersVersion() const { return layersVer_; }
32+
unsigned fwVersion() const { return layersVer_; }
33+
unsigned patternsVersion() const { return patternsVer_; }
34+
std::string synthDate() const { return synthDate_; }
35+
void setAlgoVersion(unsigned algoV) { algorithmVer_ = algoV; }
36+
void setLayersVersion(unsigned layersV) { layersVer_ = layersV; }
37+
void setFwVersion(unsigned layersV) { layersVer_ = layersV; }
38+
void setPatternsVersion(unsigned patternsV) { patternsVer_ = patternsV; }
39+
void setSynthDate(std::string sDate) { synthDate_ = sDate; }
40+
41+
///Firmware configuration parameters
42+
unsigned algorithmVer_;
43+
unsigned layersVer_;
44+
unsigned patternsVer_;
45+
std::string synthDate_;
46+
47+
COND_SERIALIZABLE;
48+
};
49+
#endif

‎CondFormats/L1TObjects/src/L1TMuonOverlapFwVersion.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "CondFormats/L1TObjects/interface/L1TMuonOverlapFwVersion.h"

‎CondFormats/L1TObjects/src/T_EventSetup_L1TMuonOverlapFwVersion.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "CondFormats/L1TObjects/interface/L1TMuonOverlapFwVersion.h"
2+
#include "FWCore/Utilities/interface/typelookup.h"
3+
4+
TYPELOOKUP_DATA_REG(L1TMuonOverlapFwVersion);

0 commit comments

Comments
 (0)