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.

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

update master #17

Merged
merged 75 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
18b6dce
Development of tools to compute tof with non constant speed
fabiocos Oct 12, 2021
7521f48
write tofs into the event
fabiocos Oct 13, 2021
0b06a99
Update TOFPIDProducer to use externally computed tofs for heavy mass …
fabiocos Oct 13, 2021
70db6a3
Use non constant speed for final tof calculation
fabiocos Oct 14, 2021
b4202be
DbOutputService fixes
fabferro Nov 9, 2021
485c21c
use of lambda expression
fabferro Nov 9, 2021
666f609
Update treatment of speed in hit association
fabiocos Nov 11, 2021
c2ef669
Merged fc-mixtof-devel from repository fabiocos with cms-merge-topic
fabiocos Nov 11, 2021
e207800
Code cleaning
fabiocos Nov 11, 2021
5c96205
clening code
fabferro Nov 22, 2021
f3ce21e
First working version of a userhook factory
Nov 22, 2021
2bc08a1
Add SUEP decay modules
Nov 22, 2021
01dc7b3
Code checks
Nov 22, 2021
abade88
More code checks
Nov 22, 2021
11bd492
code checks and removing PF changes addressed in other PR
laurenhay Nov 23, 2021
92e8afe
Take out superfluous printout
Nov 23, 2021
ba5f562
Modify the factory to be able to generate multiple user plugins
Nov 23, 2021
2f787fc
Changed the configuration input to use a VPSet
Nov 23, 2021
acf8af1
Added small macro for defining user hook+Some minor code changes
Nov 23, 2021
c33d03c
Switched new for shared_ptr when creating the custom hooks collection
Nov 23, 2021
4f2564c
Comments by Slava
fabiocos Nov 24, 2021
338f7cf
Move TrackSegments to use floats, as suggested by Slava
fabiocos Nov 24, 2021
64c2e3b
Results from the code-checks again
Nov 24, 2021
633accd
Replacing createOneIOV+appendOneIOV blocks with writeOneIOV
laurenhay Nov 25, 2021
145b2ac
Code checks
laurenhay Nov 25, 2021
f48deba
fix reference
fabferro Nov 26, 2021
b0ab699
code format
fabferro Nov 26, 2021
8423746
orbitNumber() fixed to return uint32_t
jshlee Nov 27, 2021
cac8881
fix orbitNumber number comparision
jshlee Nov 27, 2021
a969c90
add DCS v2 record containing validity bits for DCS voltage/status inf…
smorovic Nov 29, 2021
2b0daac
remove entirely double from TrackSegments, Slava's suggestion
fabiocos Nov 30, 2021
00df237
adding FED dump
smorovic Nov 30, 2021
c37ab72
Make use of unique_ptr in the codes of SimG4CMS/Calo
Nov 30, 2021
4c54db9
Code check
Nov 30, 2021
55eb2cf
Move the whole TrackExtenderWithMTD to use float
fabiocos Nov 30, 2021
9cfff19
Make it a bit more cmssw-compliant
Nov 30, 2021
71fbca3
Use thread safe modules in DPGAnalysis/SiStripTools
Dr15Jones Dec 1, 2021
2fee424
Move DB related codes to CondTools
laurenhay Dec 1, 2021
afda4d7
Remove useless static_cast
fabiocos Dec 2, 2021
9c29b74
DTCCablingMapProducer: incorporate modified header; reflect IT cablin…
adewit Dec 2, 2021
f22f1f3
Simplify and correct the test script for validation against the flat …
Dec 3, 2021
2111500
Clean-up of BeamSpot PCL configs
dzuolo Dec 3, 2021
a20f595
Initialisation of data members
civanch Dec 3, 2021
6b72e7f
consistent handling of step skipping for more workflows
kpedro88 Dec 3, 2021
815a5fe
include run3_nanoAOD_devel in Run3 Era
kpedro88 Dec 3, 2021
28dd055
fix CondDB connection in CondTools/SiStrip miscalibration tools
mmusich Dec 3, 2021
8cb0da3
fix mistake done in 36129
mmusich Dec 3, 2021
508f9f0
Apply suggestions from code review
mmusich Dec 4, 2021
ff4cd90
Merge pull request #36268 from jshlee/GEMDataFormats-bugfix-12_2_X
cmsbuild Dec 4, 2021
04ffa39
Merge pull request #36214 from laurenhay/DBOutput_PFandJetMET
cmsbuild Dec 4, 2021
f78f1f0
Merge pull request #36294 from smorovic/12_2_X-newSoftFED
cmsbuild Dec 4, 2021
99d2483
SimHits counting
civanch Dec 4, 2021
4f47e47
code format
civanch Dec 4, 2021
141ab41
Merge pull request #36342 from bsunanda/Phase2-hgx297A
cmsbuild Dec 4, 2021
0122c37
Merge pull request #36345 from dzuolo/BeamSpotPCLCleanUp
cmsbuild Dec 4, 2021
d43fb4f
Merge pull request #36333 from adewit/itcabling
cmsbuild Dec 4, 2021
50dfacc
Merge pull request #36301 from bsunanda/Run3-sim99
cmsbuild Dec 4, 2021
cdf8edc
Merge pull request #36361 from mmusich/fixConddbConnectionSiStripUnit…
cmsbuild Dec 4, 2021
239f053
Merge pull request #36362 from mmusich/fixCondToolsHLT_WrongEndJob
cmsbuild Dec 4, 2021
ad121a5
Merge pull request #36346 from civanch/initialisation_calo_particles
cmsbuild Dec 4, 2021
ad04da7
Merge pull request #36350 from kpedro88/Phase2-WF78
cmsbuild Dec 5, 2021
20d8ce3
[ASAN] fix unit tests by setting NO_TEST_PREFIX flag for ASAN IB
iarspider Dec 5, 2021
1a48c79
DB output migration of RPCReadOutMapBuilder
tvami Dec 5, 2021
3fe4b2f
HLT menu migration to 12_2_0_pre3
Martin-Grunewald Dec 6, 2021
258971b
Set RootInputFileSequence::usedFallback_
makortel Dec 6, 2021
afd77df
Inclusion of new ECAL PF cluster corrections in Run-3 MC GTs
tvami Dec 6, 2021
6024465
Merge pull request #36379 from makortel/rootInputFileSequenceUsedFall…
cmsbuild Dec 7, 2021
963a9c2
Merge pull request #36367 from tvami/RPCObjectsModern
cmsbuild Dec 7, 2021
a067a49
Merge pull request #36202 from fabiocos/fc-mixtof
cmsbuild Dec 7, 2021
c763b5a
Merge pull request #36238 from cericeci/SUEPpythia_dev
cmsbuild Dec 7, 2021
7914cd4
Merge pull request #36365 from iarspider/patch-1
cmsbuild Dec 7, 2021
f8acea5
Merge pull request #36377 from tvami/IncEGammaPF
cmsbuild Dec 7, 2021
1122cb3
Merge pull request #36321 from Dr15Jones/modernizeDPGAnalysisSiStripT…
cmsbuild Dec 7, 2021
84856a9
Merge pull request #36374 from cms-tsg-storm/HLTmigrationTo1220pre3
cmsbuild Dec 7, 2021
b5b1719
Merge pull request #36180 from CTPPS/dbFixes
cmsbuild Dec 7, 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
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,7 @@
# ------------------------------------------------------------------------------
# configure the beam-spot production
from Calibration.TkAlCaRecoProducers.AlcaBeamSpotProducer_cff import *
alcaBeamSpotProducer.BeamFitter.TrackCollection = 'ALCARECOTkAlMinBias'
alcaBeamSpotProducer.BeamFitter.MinimumTotalLayers = 6
alcaBeamSpotProducer.BeamFitter.MinimumPixelLayers = -1
alcaBeamSpotProducer.BeamFitter.MaximumNormChi2 = 10
alcaBeamSpotProducer.BeamFitter.MinimumInputTracks = 50
alcaBeamSpotProducer.BeamFitter.MinimumPt = 1.0
alcaBeamSpotProducer.BeamFitter.MaximumImpactParameter = 1.0
alcaBeamSpotProducer.BeamFitter.TrackAlgorithm = cms.untracked.vstring()
#alcaBeamSpotProducer.BeamFitter.Debug = True
alcaBeamSpotProducer.PVFitter.Apply3DFit = True
alcaBeamSpotProducer.PVFitter.minNrVerticesForFit = 10

# fit as function of lumi sections
alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.fitEveryNLumi = 1
alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.resetEveryNLumi = 1

# alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.TrackCollection = cms.untracked.InputTag('ALCARECOTkAlMinBias')
# alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.fitEveryNLumi = cms.untracked.int32(1)
# alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.resetEveryNLumi = cms.untracked.int32(1)
# alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.TrackCollection = cms.untracked.InputTag('ALCARECOTkAlMinBias')
# alcaBeamSpotProducer.BeamFitter.TrackCollection = cms.untracked.InputTag('ALCARECOTkAlMinBias')

# ------------------------------------------------------------------------------
# this is for filtering on L1 technical trigger bit
Expand All @@ -51,38 +31,6 @@
throw = False # tolerate triggers stated above, but not available
)


#from L1TriggerConfig.L1GtConfigProducers.L1GtTriggerMaskTechTrigConfig_cff import *
#from HLTrigger.HLTfilters.hltLevel1GTSeed_cfi import hltLevel1GTSeed
#L1CollTrigger = hltLevel1GTSeed.clone()

#L1CollTrigger.L1TechTriggerSeeding = cms.bool(True)
#L1CollTrigger.L1SeedsLogicalExpression = cms.string('0 AND ( 40 OR 41 ) AND NOT (36 OR 37 OR 38 OR 39)')


# ------------------------------------------------------------------------------
# configuration to reproduce offlinePrimaryVertices
# FIXME: needs to be moved in the TkAlMinBias definition
# from RecoVertex.BeamSpotProducer.BeamSpot_cfi import *
# offlineBeamSpotForBS = offlineBeamSpot.clone()
# from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import *

# # overwrite some defaults for PV producer
# offlinePrimaryVerticesForBS = offlinePrimaryVertices.clone()
# offlinePrimaryVerticesForBS.TrackLabel = cms.InputTag("ALCARECOTkAlMinBias")
# offlinePrimaryVerticesForBS.beamSpotLabel = cms.InputTag("offlineBeamSpotForBS")
# offlinePrimaryVerticesForBS.PVSelParameters.maxDistanceToBeam = 2
# offlinePrimaryVerticesForBS.TkFilterParameters.maxNormalizedChi2 = 20
# offlinePrimaryVerticesForBS.TkFilterParameters.minSiliconLayersWithHits = 5
# offlinePrimaryVerticesForBS.TkFilterParameters.maxD0Significance = 100
# offlinePrimaryVerticesForBS.TkFilterParameters.minPixelLayersWithHits = 1
# offlinePrimaryVerticesForBS.TkClusParameters.TkGapClusParameters.zSeparation = 1
# alcaBeamSpotProducer.PVFitter.VertexCollection = "offlinePrimaryVerticesForBS"

seqALCARECOPromptCalibProd = cms.Sequence(ALCARECOTkAlMinBiasFilterForBS *
ALCARECOHltFilterForBS *
# offlineBeamSpotForBS +
# offlinePrimaryVerticesForBS +
alcaBeamSpotProducer)

#process.bsProductionPath = cms.Path(process.TkAlMinBiasFilterForBS+process.alcaBeamSpotProducer)
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
minVertexMeanWeight = cms.untracked.double(0.5),
maxVertexR = cms.untracked.double(2),
maxVertexZ = cms.untracked.double(10),
errorScale = cms.untracked.double(1.1),
errorScale = cms.untracked.double(1.0),
nSigmaCut = cms.untracked.double(50.),
FitPerBunchCrossing = cms.untracked.bool(False),
useOnlyFirstPV = cms.untracked.bool(True),
Expand Down
26 changes: 13 additions & 13 deletions Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducer_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
RunAllFitters = cms.bool(False), ## False: run only default fitter
RunBeamWidthFit = cms.bool(False),
WriteToDB = cms.bool(False), ## do not write results to DB
fitEveryNLumi = cms.untracked.int32( -1 ),
resetEveryNLumi = cms.untracked.int32( -1 )
fitEveryNLumi = cms.untracked.int32( 1 ),
resetEveryNLumi = cms.untracked.int32( 1 )
),
BeamFitter = cms.PSet(
Debug = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('generalTracks'),
TrackCollection = cms.untracked.InputTag('ALCARECOTkAlMinBias'),
IsMuonCollection = cms.untracked.bool(False),
WriteAscii = cms.untracked.bool(False),
AsciiFileName = cms.untracked.string('BeamFit.txt'), ## all results
Expand All @@ -21,34 +21,34 @@
SaveFitResults = cms.untracked.bool(False),
SavePVVertices = cms.untracked.bool(False),
OutputFileName = cms.untracked.string('analyze_d0_phi.root'),
MinimumPt = cms.untracked.double(1.2),
MinimumPt = cms.untracked.double(1.0),
MaximumEta = cms.untracked.double(2.4),
MaximumImpactParameter = cms.untracked.double(5),
MaximumImpactParameter = cms.untracked.double(1.0),
MaximumZ = cms.untracked.double(60),
MinimumTotalLayers = cms.untracked.int32(11),
MinimumPixelLayers = cms.untracked.int32(3),
MaximumNormChi2 = cms.untracked.double(2.0),
TrackAlgorithm = cms.untracked.vstring('initialStep'), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
MinimumTotalLayers = cms.untracked.int32(6),
MinimumPixelLayers = cms.untracked.int32(-1),
MaximumNormChi2 = cms.untracked.double(10.0),
TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
InputBeamWidth = cms.untracked.double(-1.0), ## if -1 use the value calculated by the analyzer
FractionOfFittedTrks = cms.untracked.double(0.9),
MinimumInputTracks = cms.untracked.int32(100)
MinimumInputTracks = cms.untracked.int32(50)
),
PVFitter = cms.PSet(
Debug = cms.untracked.bool(False),
Apply3DFit = cms.untracked.bool(False),
Apply3DFit = cms.untracked.bool(True),
VertexCollection = cms.untracked.InputTag('offlinePrimaryVertices'),
#WriteAscii = cms.untracked.bool(True),
#AsciiFileName = cms.untracked.string('PVFit.txt'),
maxNrStoredVertices = cms.untracked.uint32(10000),
minNrVerticesForFit = cms.untracked.uint32(100),
minNrVerticesForFit = cms.untracked.uint32(10),
minVertexNdf = cms.untracked.double(10.),
maxVertexNormChi2 = cms.untracked.double(10.),
minVertexNTracks = cms.untracked.uint32(0),
minVertexMeanWeight = cms.untracked.double(0.5),
maxVertexR = cms.untracked.double(2),
maxVertexZ = cms.untracked.double(10),
errorScale = cms.untracked.double(0.9),
errorScale = cms.untracked.double(1.0),
nSigmaCut = cms.untracked.double(50.),
FitPerBunchCrossing = cms.untracked.bool(False),
useOnlyFirstPV = cms.untracked.bool(False),
Expand Down
3 changes: 3 additions & 0 deletions CondCore/Utilities/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<ifrelease name="_ASAN_">
<flags NO_TEST_PREFIX="1"/>
</ifrelease>
<use name="CondCore/CondDB"/>
<use name="CondCore/Utilities"/>
<use name="CondFormats/Common"/>
Expand Down
11 changes: 5 additions & 6 deletions CondFormats/RPCObjects/test/RPCReadOutMapBuilder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class RPCReadOutMapBuilder : public edm::one::EDAnalyzer<> {
void endJob() override;

private:
RPCReadOutMapping* cabling;
RPCReadOutMapping cabling;
string m_record;
};

Expand All @@ -56,10 +56,9 @@ void RPCReadOutMapBuilder::endJob() {

try {
if (mydbservice->isNewTagRequest(m_record)) {
mydbservice->createNewIOV<RPCReadOutMapping>(
cabling, mydbservice->beginOfTime(), mydbservice->endOfTime(), m_record);
mydbservice->createOneIOV(cabling, mydbservice->beginOfTime(), m_record);
} else {
mydbservice->appendSinceTime<RPCReadOutMapping>(cabling, mydbservice->currentTime(), m_record);
mydbservice->appendOneIOV(cabling, mydbservice->currentTime(), m_record);
}
} catch (std::exception& e) {
cout << "std::exception: " << e.what();
Expand All @@ -73,7 +72,7 @@ void RPCReadOutMapBuilder::endJob() {
void RPCReadOutMapBuilder::beginJob() {
cout << "BeginJob method " << endl;
cout << "Building RPC Cabling" << endl;
cabling = new RPCReadOutMapping("My map V-TEST");
RPCReadOutMapping cabling;
{
DccSpec dcc(790);
for (int idtb = 1; idtb <= 68; idtb++) {
Expand Down Expand Up @@ -103,7 +102,7 @@ void RPCReadOutMapBuilder::beginJob() {
}
dcc.add(tb);
}
cabling->add(dcc);
cabling.add(dcc);
}
}

Expand Down
5 changes: 2 additions & 3 deletions CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ class PPSTimingCalibrationWriter : public edm::one::EDAnalyzer<> {

void PPSTimingCalibrationWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
// get timing calibration parameters
edm::ESHandle<PPSTimingCalibration> hTimingCalib = iSetup.getHandle(tokenCalibration_);

const auto& hTimingCalib = iSetup.getData(tokenCalibration_);
// store the calibration into a DB object
edm::Service<cond::service::PoolDBOutputService> poolDbService;
if (poolDbService.isAvailable())
poolDbService->writeOneIOV(*hTimingCalib.product(), poolDbService->currentTime(), "PPSTimingCalibrationRcd");
poolDbService->writeOneIOV(hTimingCalib, poolDbService->currentTime(), "PPSTimingCalibrationRcd");
else
throw cms::Exception("PPSTimingCalibrationWriter") << "PoolDBService required.";
}
Expand Down
9 changes: 2 additions & 7 deletions CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,7 @@ class WriteCTPPSBeamParameters : public edm::one::EDAnalyzer<> {
//---------------------------------------------------------------------------------------

void WriteCTPPSBeamParameters::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
edm::ESHandle<CTPPSBeamParameters> bp = iSetup.getHandle(tokenBeamParameters_);

// Pointer for the conditions data object
const CTPPSBeamParameters* p = bp.product();

const auto& beamParam = iSetup.getData(tokenBeamParameters_);
// Using "lumiid" as IOV
const edm::LuminosityBlock& iLBlock = iEvent.getLuminosityBlock();
edm::LuminosityBlockID lu(iLBlock.run(), iLBlock.id().luminosityBlock());
Expand All @@ -67,8 +63,7 @@ void WriteCTPPSBeamParameters::analyze(const edm::Event& iEvent, const edm::Even
// Write to database or sqlite file
edm::Service<cond::service::PoolDBOutputService> poolDbService;
if (poolDbService.isAvailable())
poolDbService->writeOneIOV(*p, ilumi, "CTPPSBeamParametersRcd");
// poolDbService->writeOne( p, poolDbService->currentTime(), "CTPPSBeamParametersRcd" );
poolDbService->writeOneIOV(beamParam, ilumi, "CTPPSBeamParametersRcd");
else
throw std::runtime_error("PoolDBService required.");
}
Expand Down
29 changes: 17 additions & 12 deletions CondTools/CTPPS/src/CTPPSRPAlignmentInfoAnalyzer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,25 @@ CTPPSRPAlignmentInfoAnalyzer::CTPPSRPAlignmentInfoAnalyzer(const edm::ParameterS
//----------------------------------------------------------------------------------------------------

void CTPPSRPAlignmentInfoAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
edm::ESHandle<CTPPSRPAlignmentCorrectionsData> alignments;
const auto alignments = [&r = record_,
&eS = iSetup,
&tAI = tokenAlignmentIdeal_,
&tAR = tokenAlignmentReal_,
&tAM = tokenAlignmentMisaligned_]() -> const CTPPSRPAlignmentCorrectionsData* {
if (r == "CTPPSRPAlignmentCorrectionsDataRcd") {
return &eS.getData(tAI);
} else if (r == "RPRealAlignmentRecord") {
return &eS.getData(tAR);
} else {
return &eS.getData(tAM);
}
}();

if (strcmp(record_.c_str(), "CTPPSRPAlignmentCorrectionsDataRcd") == 0) {
alignments = iSetup.getHandle(tokenAlignmentIdeal_);
} else if (strcmp(record_.c_str(), "RPRealAlignmentRecord") == 0) {
alignments = iSetup.getHandle(tokenAlignmentReal_);
} else {
alignments = iSetup.getHandle(tokenAlignmentMisaligned_);
}

const CTPPSRPAlignmentCorrectionsData* pCTPPSRPAlignmentCorrectionsData = alignments.product();
edm::Service<cond::service::PoolDBOutputService> poolDbService;
if (poolDbService.isAvailable()) {
poolDbService->writeOneIOV(*pCTPPSRPAlignmentCorrectionsData, iov_, record_);
if (!poolDbService.isAvailable()) {
edm::LogError("CTPPSAlignmentInfoAnalyzer") << " DbService not available ";
} else {
poolDbService->writeOneIOV(alignments, iov_, record_);
}
}

Expand Down
10 changes: 5 additions & 5 deletions CondTools/CTPPS/src/WriteCTPPSPixGainCalibrations.cc
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ void WriteCTPPSPixGainCalibrations::getHistos() {
}

void WriteCTPPSPixGainCalibrations::fillDB() {
CTPPSPixelGainCalibrations* gainCalibsTest = new CTPPSPixelGainCalibrations();
CTPPSPixelGainCalibrations* gainCalibsTest1 = new CTPPSPixelGainCalibrations();
CTPPSPixelGainCalibrations gainCalibsTest;
CTPPSPixelGainCalibrations gainCalibsTest1;

// std::cout<<"Here! "<<std::endl;

Expand Down Expand Up @@ -225,9 +225,9 @@ void WriteCTPPSPixGainCalibrations::fillDB() {
setDummyFullPlane(orderedPeds, orderedGains, 6 * 52 * 80);
}

gainCalibsTest->setGainCalibration(tempdetid, orderedPeds, orderedGains);
gainCalibsTest.setGainCalibration(tempdetid, orderedPeds, orderedGains);
// std::cout << "Here detid = "<<tempdetid <<std::endl;
gainCalibsTest1->setGainCalibration(tempdetid, tempPGCalib);
gainCalibsTest1.setGainCalibration(tempdetid, tempPGCalib);
// std::cout << "Here again"<<std::endl;
}
// std::cout<<" Here 3!"<<std::endl;
Expand All @@ -236,7 +236,7 @@ void WriteCTPPSPixGainCalibrations::fillDB() {
edm::LogError("CTPPSPixGainsCalibrationWriter") << "Db Service Unavailable";
return;
}
mydbservice->writeOne(gainCalibsTest, mydbservice->currentTime(), m_record);
mydbservice->writeOneIOV(gainCalibsTest, mydbservice->currentTime(), m_record);
}

void WriteCTPPSPixGainCalibrations::setDummyFullPlane(std::vector<float>& peds,
Expand Down
8 changes: 3 additions & 5 deletions CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ WriteCTPPSPixelAnalysisMask::WriteCTPPSPixelAnalysisMask(const edm::ParameterSet
tokenAnalysisMask_(esConsumes<CTPPSPixelAnalysisMask, CTPPSPixelAnalysisMaskRcd>(edm::ESInputTag("", label_))) {}

void WriteCTPPSPixelAnalysisMask::analyze(const edm::Event &, edm::EventSetup const &es) {
// get analysis mask to mask channels
ESHandle<CTPPSPixelAnalysisMask> hAnalysisMask = es.getHandle(tokenAnalysisMask_);

/*// print analysisMask
printf("* mask\n");
for (const auto &p : analysisMask->analysisMask)
Expand All @@ -70,10 +67,11 @@ void WriteCTPPSPixelAnalysisMask::analyze(const edm::Event &, edm::EventSetup co
*/

// Write Analysis Mask to sqlite file:
const CTPPSPixelAnalysisMask *pCTPPSPixelAnalysisMask = hAnalysisMask.product(); // Analysis Mask

const auto &analysisMask = es.getData(tokenAnalysisMask_);
edm::Service<cond::service::PoolDBOutputService> poolDbService;
if (poolDbService.isAvailable()) {
poolDbService->writeOneIOV(*pCTPPSPixelAnalysisMask, analysismaskiov_, /*m_record*/ record_);
poolDbService->writeOneIOV(analysisMask, analysismaskiov_, record_);
}
}

Expand Down
9 changes: 4 additions & 5 deletions CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,19 @@ WriteCTPPSPixelDAQMapping::WriteCTPPSPixelDAQMapping(const edm::ParameterSet &ps
tokenMapping_(esConsumes<CTPPSPixelDAQMapping, CTPPSPixelDAQMappingRcd>(edm::ESInputTag("", label_))) {}

void WriteCTPPSPixelDAQMapping::analyze(const edm::Event &, edm::EventSetup const &es) {
// get DAQ mapping
edm::ESHandle<CTPPSPixelDAQMapping> hMapping = es.getHandle(tokenMapping_);

// print mapping
/*printf("* DAQ mapping\n");
for (const auto &p : mapping->ROCMapping)
cout << " " << p.first << " -> " << p.second << endl;
*/

// Write DAQ Mapping to sqlite file:
const CTPPSPixelDAQMapping *pCTPPSPixelDAQMapping = hMapping.product(); // DAQ Mapping

const auto &mapping = es.getData(tokenMapping_);

edm::Service<cond::service::PoolDBOutputService> poolDbService;
if (poolDbService.isAvailable()) {
poolDbService->writeOneIOV(*pCTPPSPixelDAQMapping, daqmappingiov_, /*m_record*/ record_);
poolDbService->writeOneIOV(mapping, daqmappingiov_, record_);
}
}

Expand Down
11 changes: 5 additions & 6 deletions CondTools/Geometry/plugins/PPSGeometryBuilder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,19 @@ void PPSGeometryBuilder::analyze(const edm::Event& iEvent, const edm::EventSetup
}

// Build persistent geometry data from geometry
PDetGeomDesc* serializableData =
new PDetGeomDesc(); // cond::service::PoolDBOutputService::writeOne interface requires raw pointer.
PDetGeomDesc serializableData; // cond::service::PoolDBOutputService::writeOne interface requires raw pointer.
int counter = 0;
if (geoInfoRoot) {
buildSerializableDataFromGeoInfo(serializableData, geoInfoRoot.get(), counter);
buildSerializableDataFromGeoInfo(&serializableData, geoInfoRoot.get(), counter);
}

// Save geometry in the database
if (serializableData->container_.empty()) {
if (serializableData.container_.empty()) {
throw cms::Exception("PPSGeometryBuilder") << "PDetGeomDesc is empty, no geometry to save in the database.";
} else {
if (dbService_.isAvailable()) {
dbService_->writeOne(serializableData, dbService_->beginOfTime(), "VeryForwardIdealGeometryRecord");
edm::LogInfo("PPSGeometryBuilder") << "Successfully wrote DB, with " << serializableData->container_.size()
dbService_->writeOneIOV(serializableData, dbService_->beginOfTime(), "VeryForwardIdealGeometryRecord");
edm::LogInfo("PPSGeometryBuilder") << "Successfully wrote DB, with " << serializableData.container_.size()
<< " PDetGeomDesc items.";
} else {
throw cms::Exception("PPSGeometryBuilder") << "PoolDBService required.";
Expand Down
6 changes: 4 additions & 2 deletions CondTools/HLT/plugins/AlCaRecoTriggerBitsRcdRead.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class AlCaRecoTriggerBitsRcdRead : public edm::one::EDAnalyzer<edm::one::WatchRu

void analyze(const edm::Event &evt, const edm::EventSetup &evtSetup) override {}
void beginRun(const edm::Run &run, const edm::EventSetup &evtSetup) override;
void endRun(edm::Run const &, edm::EventSetup const &) override;
void endRun(edm::Run const &, edm::EventSetup const &) override {}
void endJob() override;

static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);

Expand Down Expand Up @@ -125,6 +126,7 @@ AlCaRecoTriggerBitsRcdRead::OutputType AlCaRecoTriggerBitsRcdRead::stringToEnum(
///////////////////////////////////////////////////////////////////////
void AlCaRecoTriggerBitsRcdRead::beginRun(const edm::Run &run, const edm::EventSetup &iSetup) {
if (watcher_.check(iSetup)) { // new IOV for this run
edm::LogPrint("AlCaRecoTriggerBitsRcdRead") << "new IOV: " << firstRun_ << "-" << lastRun_;
// Print last IOV - if there has already been one:
if (lastRun_ != 0)
this->printMap(firstRun_, lastRun_, lastTriggerBits_);
Expand All @@ -139,7 +141,7 @@ void AlCaRecoTriggerBitsRcdRead::beginRun(const edm::Run &run, const edm::EventS
}

///////////////////////////////////////////////////////////////////////
void AlCaRecoTriggerBitsRcdRead::endRun(edm::Run const &, edm::EventSetup const &) {
void AlCaRecoTriggerBitsRcdRead::endJob() {
// Print for very last IOV, not treated yet in beginRun(..):
this->printMap(firstRun_, lastRun_, lastTriggerBits_);
}
Expand Down
Loading