Skip to content

Commit

Permalink
apply comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyunyong
hyunyong committed Oct 18, 2021
1 parent f6fadf7 commit 81220fe
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 73 deletions.
6 changes: 3 additions & 3 deletions Alignment/MuonAlignment/interface/MuonAlignmentInputSurveyDB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

class MuonAlignmentInputSurveyDB : public MuonAlignmentInputMethod {
public:
MuonAlignmentInputSurveyDB(const DTGeometry* DTGeometry,
const CSCGeometry* CSCGeometry,
const GEMGeometry* GEMGeometry,
MuonAlignmentInputSurveyDB(const DTGeometry* dtGeometry,
const CSCGeometry* cscGeometry,
const GEMGeometry* gemGeometry,
const Alignments* dtSurvey,
const Alignments* cscSurvey,
const SurveyErrors* dtSurveyError,
Expand Down
15 changes: 14 additions & 1 deletion Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,20 @@ MuonGeometryArrange::MuonGeometryArrange(const edm::ParameterSet& cfg)
firstEvent_(true),
idealInputLabel1("MuonGeometryArrangeLabel1"),
idealInputLabel2("MuonGeometryArrangeLabel2"),
idealInputLabel2a("MuonGeometryArrangeLabel2a") {
idealInputLabel2a("MuonGeometryArrangeLabel2a"),
geomIdeal("MuonGeometryArrangeGeomIdeal"),
dtGeomToken1_(esConsumes(edm::ESInputTag("", idealInputLabel1))),
cscGeomToken1_(esConsumes(edm::ESInputTag("", idealInputLabel1))),
gemGeomToken1_(esConsumes(edm::ESInputTag("", idealInputLabel1))),
dtGeomToken2_(esConsumes(edm::ESInputTag("", idealInputLabel2))),
cscGeomToken2_(esConsumes(edm::ESInputTag("", idealInputLabel2))),
gemGeomToken2_(esConsumes(edm::ESInputTag("", idealInputLabel2))),
dtGeomToken3_(esConsumes(edm::ESInputTag("", idealInputLabel2a))),
cscGeomToken3_(esConsumes(edm::ESInputTag("", idealInputLabel2a))),
gemGeomToken3_(esConsumes(edm::ESInputTag("", idealInputLabel2a))),
dtGeomIdealToken_(esConsumes(edm::ESInputTag("", geomIdeal))),
cscGeomIdealToken_(esConsumes(edm::ESInputTag("", geomIdeal))),
gemGeomIdealToken_(esConsumes(edm::ESInputTag("", geomIdeal))) {
referenceMuon = nullptr;
currentMuon = nullptr;
// Input is XML
Expand Down
6 changes: 3 additions & 3 deletions Alignment/MuonAlignment/plugins/MuonGeometryArrange.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* \author Nhan Tran
*/

#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "Alignment/MuonAlignment/interface/AlignableMuon.h"
#include "CondFormats/Alignment/interface/SurveyErrors.h"
Expand All @@ -35,7 +35,7 @@ class MuonAlignment;
class TGraph;
class TH2F;

class MuonGeometryArrange : public edm::EDAnalyzer {
class MuonGeometryArrange : public edm::one::EDAnalyzer<> {
public:
typedef AlignTransform SurveyValue;
typedef Alignments SurveyValues;
Expand Down Expand Up @@ -170,7 +170,7 @@ class MuonGeometryArrange : public edm::EDAnalyzer {

bool firstEvent_;

std::string idealInputLabel1, idealInputLabel2, idealInputLabel2a;
std::string idealInputLabel1, idealInputLabel2, idealInputLabel2a, geomIdeal;

const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken1_;
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> cscGeomToken1_;
Expand Down
12 changes: 6 additions & 6 deletions Alignment/MuonAlignment/src/MuonAlignmentInputSurveyDB.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
//
// constructors and destructor
//
MuonAlignmentInputSurveyDB::MuonAlignmentInputSurveyDB(const DTGeometry* DTGeometry,
const CSCGeometry* CSCGeometry,
const GEMGeometry* GEMGeometry,
MuonAlignmentInputSurveyDB::MuonAlignmentInputSurveyDB(const DTGeometry* dtGeometry,
const CSCGeometry* cscGeometry,
const GEMGeometry* gemGeometry,
const Alignments* dtSurvey,
const Alignments* cscSurvey,
const SurveyErrors* dtSurveyError,
const SurveyErrors* cscSurveyError)
: dtGeometry_(DTGeometry),
cscGeometry_(CSCGeometry),
gemGeometry_(GEMGeometry),
: dtGeometry_(dtGeometry),
cscGeometry_(cscGeometry),
gemGeometry_(gemGeometry),
dtSurvey_(dtSurvey),
cscSurvey_(cscSurvey),
dtSurveyError_(dtSurveyError),
Expand Down
103 changes: 43 additions & 60 deletions Alignment/MuonAlignment/test/MuonGeometryArrange.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,70 +3,56 @@

#Ideal geometry
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi")
process.load('Configuration.Geometry.GeometryExtended2021_cff')
process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi")
process.load("Geometry.MuonNumbering.muonGeometryConstants_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")

from Configuration.AlCa.GlobalTag import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, "auto:phase1_2021_design")

process.DTGeometryMuonGeometryArrange1 = cms.ESProducer("DTGeometryESModule",
appendToDataLabel = cms.string('MuonGeometryArrangeLabel1'),
applyAlignment = cms.bool(False),
alignmentsLabel = cms.string(''),
fromDDD = cms.bool(True)
)
import Geometry.DTGeometryBuilder.dtGeometryDB_cfi
import Geometry.CSCGeometryBuilder.cscGeometryDB_cfi
import Geometry.GEMGeometryBuilder.gemGeometryDB_cfi

process.CSCGeometryMuonGeometryArrange1 = cms.ESProducer("CSCGeometryESModule",
appendToDataLabel = cms.string('MuonGeometryArrangeLabel1'),
debugV = cms.untracked.bool(False),
useGangedStripsInME1a = cms.bool(False),
alignmentsLabel = cms.string(''),
useOnlyWiresInME1a = cms.bool(False),
useRealWireGeometry = cms.bool(True),
useCentreTIOffsets = cms.bool(False),
applyAlignment = cms.bool(False),
fromDDD = cms.bool(True),
fromDD4hep = cms.bool(False)
)
process.DTGeometryIdeal = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone()
process.DTGeometryIdeal.appendToDataLabel = 'MuonGeometryArrangeGeomIdeal'
process.DTGeometryIdeal.applyAlignment = cms.bool(False)
process.CSCGeometryIdeal = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone()
process.CSCGeometryIdeal.appendToDataLabel = 'MuonGeometryArrangeGeomIdeal'
process.CSCGeometryIdeal.applyAlignment = cms.bool(False)
process.GEMGeometryIdeal = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone()
process.GEMGeometryIdeal.appendToDataLabel = 'MuonGeometryArrangeGeomIdeal'
process.GEMGeometryIdeal.applyAlignment = cms.bool(False)

process.DTGeometryMuonGeometryArrange2 = cms.ESProducer("DTGeometryESModule",
appendToDataLabel = cms.string('MuonGeometryArrangeLabel2'),
applyAlignment = cms.bool(False),
alignmentsLabel = cms.string(''),
fromDDD = cms.bool(True)
)

process.CSCGeometryMuonGeometryArrange2 = cms.ESProducer("CSCGeometryESModule",
appendToDataLabel = cms.string('MuonGeometryArrangeLabel2'),
debugV = cms.untracked.bool(False),
useGangedStripsInME1a = cms.bool(False),
alignmentsLabel = cms.string(''),
useOnlyWiresInME1a = cms.bool(False),
useRealWireGeometry = cms.bool(True),
useCentreTIOffsets = cms.bool(False),
applyAlignment = cms.bool(False),
fromDDD = cms.bool(True),
fromDD4hep = cms.bool(False)
)
process.DTGeometryMuonGeometryArrange1 = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone()
process.DTGeometryMuonGeometryArrange1.appendToDataLabel = 'MuonGeometryArrangeLabel1'
process.DTGeometryMuonGeometryArrange1.applyAlignment = cms.bool(False)
process.CSCGeometryMuonGeometryArrange1 = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone()
process.CSCGeometryMuonGeometryArrange1.appendToDataLabel = 'MuonGeometryArrangeLabel1'
process.CSCGeometryMuonGeometryArrange1.applyAlignment = cms.bool(False)
process.GEMGeometryMuonGeometryArrange1 = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone()
process.GEMGeometryMuonGeometryArrange1.appendToDataLabel = 'MuonGeometryArrangeLabel1'
process.GEMGeometryMuonGeometryArrange1.applyAlignment = cms.bool(False)

process.DTGeometryMuonGeometryArrange2a = cms.ESProducer("DTGeometryESModule",
appendToDataLabel = cms.string('MuonGeometryArrangeLabel2a'),
applyAlignment = cms.bool(False),
alignmentsLabel = cms.string(''),
fromDDD = cms.bool(True)
)
process.DTGeometryMuonGeometryArrange2 = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone()
process.DTGeometryMuonGeometryArrange2.appendToDataLabel = 'MuonGeometryArrangeLabel2'
process.DTGeometryMuonGeometryArrange2.applyAlignment = cms.bool(False)
process.CSCGeometryMuonGeometryArrange2 = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone()
process.CSCGeometryMuonGeometryArrange2.appendToDataLabel = 'MuonGeometryArrangeLabel2'
process.CSCGeometryMuonGeometryArrange2.applyAlignment = cms.bool(False)
process.GEMGeometryMuonGeometryArrange2 = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone()
process.GEMGeometryMuonGeometryArrange2.appendToDataLabel = 'MuonGeometryArrangeLabel2'
process.GEMGeometryMuonGeometryArrange2.applyAlignment = cms.bool(False)

process.CSCGeometryMuonGeometryArrange2a = cms.ESProducer("CSCGeometryESModule",
appendToDataLabel = cms.string('MuonGeometryArrangeLabel2a'),
debugV = cms.untracked.bool(False),
useGangedStripsInME1a = cms.bool(False),
alignmentsLabel = cms.string(''),
useOnlyWiresInME1a = cms.bool(False),
useRealWireGeometry = cms.bool(True),
useCentreTIOffsets = cms.bool(False),
applyAlignment = cms.bool(False),
fromDDD = cms.bool(True),
fromDD4hep = cms.bool(False)
)
process.DTGeometryMuonGeometryArrange2a = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone()
process.DTGeometryMuonGeometryArrange2a.appendToDataLabel = 'MuonGeometryArrangeLabel2a'
process.DTGeometryMuonGeometryArrange2a.applyAlignment = cms.bool(False)
process.CSCGeometryMuonGeometryArrange2a = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone()
process.CSCGeometryMuonGeometryArrange2a.appendToDataLabel = 'MuonGeometryArrangeLabel2a'
process.CSCGeometryMuonGeometryArrange2a.applyAlignment = cms.bool(False)
process.GEMGeometryMuonGeometryArrange2a = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone()
process.GEMGeometryMuonGeometryArrange2a.appendToDataLabel = 'MuonGeometryArrangeLabel2a'
process.GEMGeometryMuonGeometryArrange2a.applyAlignment = cms.bool(False)

process.MessageLogger = cms.Service("MessageLogger",
cerr = cms.untracked.PSet(
Expand Down Expand Up @@ -117,7 +103,4 @@
)

process.p = cms.Path( process.MuonGeometryCompare )




0 comments on commit 81220fe

Please sign in to comment.