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

Fixed the PPS alignment relval - 1042 #35874

Merged
merged 2 commits into from
Oct 30, 2021
Merged

Fixed the PPS alignment relval - 1042 #35874

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
cc68a35
Fixed the PPS Alignment relval - 1042.
MatiXOfficial Oct 27, 2021
03db82d
Increased the number of events in the PPS Alignment relval.
MatiXOfficial Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalibPPS/AlignmentGlobal/plugins/PPSAlignmentHarvester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ PPSAlignmentHarvester::~PPSAlignmentHarvester() {
void PPSAlignmentHarvester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;

desc.add<std::string>("folder", "CalibPPS/Common");
desc.add<std::string>("folder", "AlCaReco/PPSAlignment");
desc.add<std::vector<std::string>>("sequence", {"x_alignment", "x_alignment_relative", "y_alignment"});
desc.add<bool>("overwrite_sh_x", true);
desc.add<std::string>("text_results_path", "./alignment_results.txt");
Expand Down
2 changes: 1 addition & 1 deletion CalibPPS/AlignmentGlobal/plugins/PPSAlignmentWorker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void PPSAlignmentWorker::fillDescriptions(edm::ConfigurationDescriptions& descri

desc.add<std::string>("label", "");
desc.add<edm::InputTag>("tagTracks", edm::InputTag("ctppsLocalTrackLiteProducer"));
desc.add<std::string>("folder", "CalibPPS/Common");
desc.add<std::string>("folder", "AlCaReco/PPSAlignment");
desc.add<bool>("debug", false);

descriptions.addWithDefaultLabel(desc);
Expand Down
21 changes: 20 additions & 1 deletion CalibPPS/AlignmentGlobal/python/PPSAlignmentHarvester_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
from CalibPPS.AlignmentGlobal.ppsAlignmentHarvester_cfi import *
import FWCore.ParameterSet.Config as cms
from DQMServices.Components.EDMtoMEConverter_cfi import EDMtoMEConverter

from CalibPPS.AlignmentGlobal.ppsAlignmentHarvester_cfi import ppsAlignmentHarvester as ppsAlignmentHarvester_

EDMtoMEConvertPPSAlignment = EDMtoMEConverter.clone()
EDMtoMEConvertPPSAlignment.lumiInputTag = cms.InputTag("MEtoEDMConvertPPSAlignment", "MEtoEDMConverterLumi")
EDMtoMEConvertPPSAlignment.runInputTag = cms.InputTag("MEtoEDMConvertPPSAlignment", "MEtoEDMConverterRun")

from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
DQMInfoPPSAlignment = DQMEDHarvester('DQMHarvestingMetadata',
subSystemFolder=cms.untracked.string('AlCaReco')
)

ppsAlignmentHarvester = ppsAlignmentHarvester_.clone()
ppsAlignmentHarvester.text_results_path = cms.string("")
ppsAlignmentHarvester.write_sqlite_results = cms.bool(True)
ppsAlignmentHarvester.x_ali_rel_final_slope_fixed = cms.bool(False)
ppsAlignmentHarvester.y_ali_final_slope_fixed = cms.bool(False)

ALCAHARVESTPPSAlignment = cms.Task(
EDMtoMEConvertPPSAlignment,
DQMInfoPPSAlignment,
ppsAlignmentHarvester
)
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_production.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
workflows[1040.1] = ['',['RunExpressPhy2017F','TIER0EXPSIPIXELCAL','ALCASPLITSIPIXELCAL','ALCAHARVDSIPIXELCAL']]

workflows[1041] = ['',['RunExpressPhy2017F','TIER0EXPPPSCAL','ALCASPLITPPSCAL','ALCAHARVDPPSCAL']]
workflows[1042] = ['',['RunExpressPhy2017F','TIER0EXPPPSCAL','ALCASPLITPPSALIG','ALCAHARVDPPSALIG']]
workflows[1042] = ['',['RunExpressPhy2017F','TIER0EXPPPSCALALIG','ALCASPLITPPSALIG','ALCAHARVDPPSALIG']]

## MC production test
#workflows[1100] = [ '',[]]
Expand Down
12 changes: 12 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2095,6 +2095,17 @@ def lhegensim2018ml(fragment,howMuch):
'--eventcontent':'ALCARECO',
}

steps['TIER0EXPPPSCALALIG']={'-s':'RAW2DIGI,L1Reco,ALCAPRODUCER:PPSCalTrackBasedSel,ENDJOB',
'-n':1000,
'--process':'ALCARECO',
'--scenario': 'pp',
'--era':'Run2_2017',
'--conditions':'auto:run2_data',
'--data': '',
'--datatier':'ALCARECO',
'--eventcontent':'ALCARECO',
}

steps['ALCASPLITHPBS']={'-s':'ALCAOUTPUT:TkAlMinBias,ALCA:PromptCalibProdBeamSpotHP+PromptCalibProdBeamSpotHPLowPU',
'--scenario':'pp',
'--data':'',
Expand Down Expand Up @@ -2127,6 +2138,7 @@ def lhegensim2018ml(fragment,howMuch):
}

steps['ALCASPLITPPSALIG']={'-s':'ALCAOUTPUT:PPSCalTrackBasedSel,ALCA:PPSAlignment',
'-n':1000,
'--scenario':'pp',
'--data':'',
'--era':'Run2_2017',
Expand Down
1 change: 0 additions & 1 deletion Configuration/StandardSequences/python/AlCaHarvesting_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@
tag = cms.string('DiamondSampicCalibration'),
timetype = cms.untracked.string('runnumber'))

ALCAHARVESTPPSAlignment = ppsAlignmentHarvester.clone()
ALCAHARVESTPPSAlignment_metadata = cms.PSet(record = cms.untracked.string('CTPPSRPAlignmentCorrectionsDataRcd'))
ALCAHARVESTPPSAlignment_dbOutput = cms.PSet(record = cms.string('CTPPSRPAlignmentCorrectionsDataRcd'),
tag = cms.string('CTPPSRPAlignment_real_pcl'),
Expand Down