Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MTD validation : update modules' names #36913

Merged
merged 2 commits into from Feb 9, 2022
Merged

MTD validation : update modules' names #36913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb84abf
Update names of MTD validation modules
fabiocos Feb 8, 2022
e0a0008
Update digitization valid fragments
fabiocos Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions Validation/Configuration/python/mtdSimValid_cff.py
View file
Open in desktop
@@ -1,16 +1,16 @@
import FWCore.ParameterSet.Config as cms

# MTD validation sequences
from Validation.MtdValidation.btlSimHits_cfi import btlSimHits
from Validation.MtdValidation.btlDigiHits_cfi import btlDigiHits
from Validation.MtdValidation.btlLocalReco_cfi import btlLocalReco
from Validation.MtdValidation.etlLocalReco_cfi import etlLocalReco
from Validation.MtdValidation.etlSimHits_cfi import etlSimHits
from Validation.MtdValidation.etlDigiHits_cfi import etlDigiHits
from Validation.MtdValidation.mtdTracks_cfi import mtdTracks
from Validation.MtdValidation.vertices4D_cfi import vertices4D
from Validation.MtdValidation.btlSimHitsValid_cfi import btlSimHitsValid
from Validation.MtdValidation.btlDigiHitsValid_cfi import btlDigiHitsValid
from Validation.MtdValidation.btlLocalRecoValid_cfi import btlLocalRecoValid
from Validation.MtdValidation.etlLocalRecoValid_cfi import etlLocalRecoValid
from Validation.MtdValidation.etlSimHitsValid_cfi import etlSimHitsValid
from Validation.MtdValidation.etlDigiHitsValid_cfi import etlDigiHitsValid
from Validation.MtdValidation.mtdTracksValid_cfi import mtdTracksValid
from Validation.MtdValidation.vertices4DValid_cfi import vertices4DValid

mtdSimValid = cms.Sequence(btlSimHits + etlSimHits )
mtdDigiValid = cms.Sequence(btlDigiHits + etlDigiHits)
mtdRecoValid = cms.Sequence(btlLocalReco + etlLocalReco + mtdTracks + vertices4D)
mtdSimValid = cms.Sequence(btlSimHitsValid + etlSimHitsValid )
mtdDigiValid = cms.Sequence(btlDigiHitsValid + etlDigiHitsValid)
mtdRecoValid = cms.Sequence(btlLocalRecoValid + etlLocalRecoValid + mtdTracksValid + vertices4DValid)

2 changes: 1 addition & 1 deletion Validation/MtdValidation/plugins/BtlDigiHitsValidation.cc
View file
Open in desktop
Expand Up @@ -294,7 +294,7 @@ void BtlDigiHitsValidation::fillDescriptions(edm::ConfigurationDescriptions& des
desc.add<edm::InputTag>("inputTag", edm::InputTag("mix", "FTLBarrel"));
desc.add<bool>("LocalPositionDebug", false);

descriptions.add("btlDigiHitsDefault", desc);
descriptions.add("btlDigiHitsDefaultValid", desc);
}

DEFINE_FWK_MODULE(BtlDigiHitsValidation);
2 changes: 1 addition & 1 deletion Validation/MtdValidation/plugins/BtlLocalRecoValidation.cc
View file
Open in desktop
Expand Up @@ -680,7 +680,7 @@ void BtlLocalRecoValidation::fillDescriptions(edm::ConfigurationDescriptions& de
desc.add<bool>("UncalibRecHitsPlots", false);
desc.add<double>("HitMinimumAmplitude", 30.); // [pC]

descriptions.add("btlLocalReco", desc);
descriptions.add("btlLocalRecoValid", desc);
}

DEFINE_FWK_MODULE(BtlLocalRecoValidation);
2 changes: 1 addition & 1 deletion Validation/MtdValidation/plugins/BtlSimHitsValidation.cc
View file
Open in desktop
Expand Up @@ -272,7 +272,7 @@ void BtlSimHitsValidation::fillDescriptions(edm::ConfigurationDescriptions& desc
desc.add<edm::InputTag>("inputTag", edm::InputTag("mix", "g4SimHitsFastTimerHitsBarrel"));
desc.add<double>("hitMinimumEnergy", 1.); // [MeV]

descriptions.add("btlSimHits", desc);
descriptions.add("btlSimHitsValid", desc);
}

DEFINE_FWK_MODULE(BtlSimHitsValidation);
2 changes: 1 addition & 1 deletion Validation/MtdValidation/plugins/EtlDigiHitsValidation.cc
View file
Open in desktop
Expand Up @@ -521,7 +521,7 @@ void EtlDigiHitsValidation::fillDescriptions(edm::ConfigurationDescriptions& des
desc.add<edm::InputTag>("inputTag", edm::InputTag("mix", "FTLEndcap"));
desc.add<bool>("LocalPositionDebug", false);

descriptions.add("etlDigiHitsDefault", desc);
descriptions.add("etlDigiHitsDefaultValid", desc);
}

DEFINE_FWK_MODULE(EtlDigiHitsValidation);
2 changes: 1 addition & 1 deletion Validation/MtdValidation/plugins/EtlLocalRecoValidation.cc
View file
Open in desktop
Expand Up @@ -1035,7 +1035,7 @@ void EtlLocalRecoValidation::fillDescriptions(edm::ConfigurationDescriptions& de
desc.add<bool>("UncalibRecHitsPlots", false);
desc.add<double>("HitMinimumAmplitude", 0.33); // [MIP]

descriptions.add("etlLocalReco", desc);
descriptions.add("etlLocalRecoValid", desc);
}

DEFINE_FWK_MODULE(EtlLocalRecoValidation);
2 changes: 1 addition & 1 deletion Validation/MtdValidation/plugins/EtlSimHitsValidation.cc
View file
Open in desktop
Expand Up @@ -551,7 +551,7 @@ void EtlSimHitsValidation::fillDescriptions(edm::ConfigurationDescriptions& desc
desc.add<double>("hitMinimumEnergy1Dis", 0.1); // [MeV]
desc.add<double>("hitMinimumEnergy2Dis", 0.001); // [MeV]

descriptions.add("etlSimHits", desc);
descriptions.add("etlSimHitsValid", desc);
}

DEFINE_FWK_MODULE(EtlSimHitsValidation);
2 changes: 1 addition & 1 deletion Validation/MtdValidation/plugins/MtdTracksValidation.cc
View file
Open in desktop
Expand Up @@ -503,7 +503,7 @@ void MtdTracksValidation::fillDescriptions(edm::ConfigurationDescriptions& descr
desc.add<double>("trackMinimumEta", 1.5);
desc.add<double>("trackMaximumEta", 3.2);

descriptions.add("mtdTracks", desc);
descriptions.add("mtdTracksValid", desc);
}

const bool MtdTracksValidation::mvaGenSel(const HepMC::GenParticle& gp, const float& charge) {
Expand Down
2 changes: 1 addition & 1 deletion Validation/MtdValidation/plugins/Primary4DVertexValidation.cc
View file
Open in desktop
Expand Up @@ -1477,7 +1477,7 @@ void Primary4DVertexValidation::fillDescriptions(edm::ConfigurationDescriptions&
lDP.push_back(0.);
lDP.push_back(42.5);
desc.add<std::vector<double>>("lineDensityPar", lDP);
descriptions.add("vertices4D", desc);
descriptions.add("vertices4DValid", desc);
}

const bool Primary4DVertexValidation::mvaTPSel(const TrackingParticle& tp) {
Expand Down
6 changes: 6 additions & 0 deletions Validation/MtdValidation/python/btlDigiHitsValid_cfi.py
View file
Open in desktop
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms
from Validation.MtdValidation.btlDigiHitsDefaultValid_cfi import btlDigiHitsDefaultValid as _btlDigiHitsDefaultValid
btlDigiHitsValid = _btlDigiHitsDefaultValid.clone()

from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
premix_stage2.toModify(btlDigiHitsValid, inputTag = "mixData:FTLBarrel")
6 changes: 0 additions & 6 deletions Validation/MtdValidation/python/btlDigiHits_cfi.py
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions Validation/MtdValidation/python/etlDigiHitsValid_cfi.py
View file
Open in desktop
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms
from Validation.MtdValidation.etlDigiHitsDefaultValid_cfi import etlDigiHitsDefaultValid as _etlDigiHitsDefaultValid
etlDigiHitsValid = _etlDigiHitsDefaultValid.clone()

from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
premix_stage2.toModify(etlDigiHitsValid, inputTag = "mixData:FTLEndcap")
6 changes: 0 additions & 6 deletions Validation/MtdValidation/python/etlDigiHits_cfi.py
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions Validation/MtdValidation/test/mtdValidation_cfg.py
View file
Open in desktop
Expand Up @@ -27,29 +27,29 @@
for a in process.aliases: delattr(process, a)

# --- BTL Validation
process.load("Validation.MtdValidation.btlSimHits_cfi")
process.load("Validation.MtdValidation.btlDigiHits_cfi")
process.load("Validation.MtdValidation.btlLocalReco_cfi")
btlValidation = cms.Sequence(process.btlSimHits + process.btlDigiHits + process.btlLocalReco)
process.load("Validation.MtdValidation.btlSimHitsValid_cfi")
process.load("Validation.MtdValidation.btlDigiHitsValid_cfi")
process.load("Validation.MtdValidation.btlLocalRecoValid_cfi")
btlValidation = cms.Sequence(process.btlSimHitsValid + process.btlDigiHitsValid + process.btlLocalRecoValid)

# --- ETL Validation
process.load("Validation.MtdValidation.etlSimHits_cfi")
process.load("Validation.MtdValidation.etlDigiHits_cfi")
process.load("Validation.MtdValidation.etlLocalReco_cfi")
etlValidation = cms.Sequence(process.etlSimHits + process.etlDigiHits + process.etlLocalReco)
process.load("Validation.MtdValidation.etlSimHitsValid_cfi")
process.load("Validation.MtdValidation.etlDigiHitsValid_cfi")
process.load("Validation.MtdValidation.etlLocalRecoValid_cfi")
etlValidation = cms.Sequence(process.etlSimHitsValid + process.etlDigiHitsValid + process.etlLocalRecoValid)

# --- Global Validation
process.load("Validation.MtdValidation.mtdTracks_cfi")
process.load("Validation.MtdValidation.mtdTracksValid_cfi")

process.btlDigiHits.LocalPositionDebug = True
process.etlDigiHits.LocalPositionDebug = True
process.btlLocalReco.LocalPositionDebug = True
process.etlLocalReco.LocalPositionDebug = True

process.load("Validation.MtdValidation.vertices4D_cfi")
process.load("Validation.MtdValidation.vertices4DValid_cfi")

process.DQMStore = cms.Service("DQMStore")

process.load("DQMServices.FileIO.DQMFileSaverOnline_cfi")

process.p = cms.Path( process.mix + btlValidation + etlValidation + process.mtdTracks + process.vertices4D + process.dqmSaver)
process.p = cms.Path( process.mix + btlValidation + etlValidation + process.mtdTracksValid + process.vertices4DValid + process.dqmSaver)