Skip to content
Snippets Groups Projects
Commit 684ae0ee authored by Siarhei Harkusha's avatar Siarhei Harkusha
Browse files

Fix Tile Overlay with premixed pileup (ATLASSIM-3853)

In Overlay job TileRawChannelContainer is used to check DQ status,
but in this case it is supposed that real data are used for overlay
and this container is always available.
In the case of MC this container is available but it is useless though it's harmless.
In the case of premixed data this container is not available at all.

Compilation warnings are fixed also.


Former-commit-id: 10032d031c43f6524d92dc3fa9e179458192ff19
parent f5616a97
No related branches found
No related tags found
58 merge requests!46457Draft: Adding the tools to run over data,!46454Draft: Adding the tools to be able to run over data,!45045WIP: Include another condition for hit merging in FCS_StepInfoSD.cxx,!45043Merge branch 'Update-DAOD_IDNCB' into '21.2',!44869Draft: Update to candidate store,!4217921.9-first_steps-InDetTrackingGeometryXML,!42171Add LAr cell DQ plots to UPC stream,!40342WIP: ATR-22546 - add missing trigger to MC16a,!39162Draft: Insert BCM' support,!38765Bis78 cabling,!37483Fix in monitoring of Pixel FE errors,!36893Fix size of RPC active region in BIS78 and strip material,!3645821.9: Improving material map description (ATLITKSW-127),!36293WIP pixel updates,!34993KF-input adding jXERHO to the AOD outputs,!34864LH rings in front ot HR rigs,!34763Fix L1_4jJ15.0ETA25 item definition (ATR-21261),!3473421.0 fix dq servers,!33996WIP: Correct MM zpositions,!3291021.3 salva s0,!3288421.0 salva s8,!3217421.9 - Bug fix for test stream creation in RD53BEncodingTool,!3135321.3,!3134821.9 README Update,!31345Add HEC sampling fractions macros,!31136added also PUsub for LargeR jets,!31123WIP: Master ttmdev,!3036121.9 fixing bug with layer indices in PixelRDOAnalysis,!29617IDPerfmonZmumu updates,!29454Idpvm 21.0 fix typo in trackselection config,!29085TRT modification for fractional charged particles,!28623Overlay as part of FastChain transform in 21.3,!28497ART tests - fixing the bugs,!27668Massimos 21.3 bis78,!27254WIP: Exclusive jets request -- Fix ExclusiveJets algo / ATR-17320,!26790Fixes for Simulation ART jobs (ATLASSIM-4309),!26747Update frozen shower generation scripts and code to be compatible with recent developments,!26592Master upload 2018 global monitoring scripts p2,!2618221.0 z counting,!25405Add new ART test: test_physics_pp_v8_chainorder_build.sh,!2420321.3 l1 muon 00 - new MuCTPI_RDO.h,!24037Make DCS Calculator dependent on sqlalchemy; fix python code quality issues,!23377WIP pixel ID scheme for ITk,!23330Inner Detector create misalignments: radial distortions,!2325521.0 z counting,!22695Master salva id perf mon,!2230421.0-ART_test-InDetPhysValMonitoring,!22214add an utility function to TrigT1TGCRecRoiSvc for storing ROI position and the eta/phi size,!22172changes related to 1-3 points in ATR-19579,!22124Changes related to ticket 19579,!22118Remove cabling information for new thresholds,!21684WIP: test push into tdaq-htt,!2153821.0-ART_test-InDetPhysValMonitoring,!21325Tilecal new laser unpack 2019 02 19,!21304WIP: Fix ATR-19377 L1Topo vbs alg,!2117721.3 po bugfixes,!21039Merging in features for HTT Bank Generation,!20518Mydev
......@@ -511,8 +511,13 @@ StatusCode TileDigitsMaker::execute() {
} else {
ATH_MSG_DEBUG( "TileRawChannelContainer for DQ check retrieved");
}
TimedRawChanContList::iterator iTzeroRawChanCont(rawchanContList.begin());
const TileRawChannelContainer * rndm_rawchan_container = (iTzeroRawChanCont->second);
const TileRawChannelContainer* rndm_rawchan_container(nullptr);
if (!rawchanContList.empty()) {
TimedRawChanContList::iterator iTzeroRawChanCont(rawchanContList.begin());
rndm_rawchan_container = iTzeroRawChanCont->second;
}
ATH_MSG_DEBUG( "setContainer method being called in TileDigitsMaker");
m_beamInfo->setContainers(rndm_digit_container, rndm_rawchan_container);
ATH_MSG_DEBUG( "Containers successfully set in TileBeamInfoProvider");
......
......@@ -478,7 +478,7 @@ void TileHitVecToCntTool::processHitVectorForPileUp(const TileHitVector* inputHi
eHitTot += ener;
TileHit * pHit = m_allHits[hit_idhash];
TileHit * pHit_DigiHSTruth;
TileHit * pHit_DigiHSTruth(nullptr);
if(m_doDigiTruth) pHit_DigiHSTruth = m_allHits_DigiHSTruth[hit_idhash];
if (0 == pHit) {
......@@ -935,7 +935,7 @@ StatusCode TileHitVecToCntTool::mergeEvent() {
for (; iHit != lastHit; ++iHit) {
TileHit *pHit = (*iHit);
TileHit *pHit_DigiHSTruth;
TileHit *pHit_DigiHSTruth(nullptr);
if(m_doDigiTruth) pHit_DigiHSTruth = new TileHit(**iHit_DigiHSTruth);
if (pHit->size() > 1 || pHit->energy() != 0.0) { // hit exists
m_hits->push_back(pHit); // store hit in container
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment