Skip to content
Snippets Groups Projects
Commit 491b548d authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'newBranch.1633589949' into 'master'

Second trial to include the BCID for Full scan mode.

See merge request atlas/athena!46998
parents fa6a4c56 9157e201
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,6 @@
#include "CaloUtils/CaloCellCorrection.h"
#include "GaudiKernel/EventContext.h"
#include "CaloEvent/CaloBCIDAverage.h"
#include "LArRecConditions/LArBadChanBitPacking.h"
#include <iostream>
LArCellCont::LArCellCont() : m_event(0), m_lumi_block(0), m_bcid(5000), m_bcidEvt(5000), m_BCIDcache(false)
......@@ -145,7 +144,6 @@ m_hashSym.resize(onlineId->febHashMax());
for(int ch=0;ch<128;ch++){
LArRoI_Map::TT_ID ttId;
LArCell* larcell = makeCell.getLArCell(febidcomp,ch,0,0,0,ttId);
const LArBadChanBitPacking packing;
if ( larcell ) { // if it is a good cell
// Fixes default value
larcell->setGain(CaloGain::LARHIGHGAIN);
......
......@@ -370,12 +370,25 @@ unsigned int TrigCaloDataAccessSvc::lateInit(const EventContext& context) { // n
cache->lastFSEvent = 0xFFFFFFFF;
CaloCellContainer* cachefullcont = new CaloCellContainer(SG::VIEW_ELEMENTS);
cachefullcont->reserve(190000);
const LArBadChannelCont& badchannel = **larBadChan;
for(unsigned int lcidx=0; lcidx < larcell->size(); lcidx++){
LArCellCollection* lcc = larcell->at(lcidx);
unsigned int lccsize = lcc->size();
for(unsigned int lccidx=0; lccidx<lccsize; lccidx++){
CaloCell* cell = ((*lcc).at(lccidx));
if ( cell && cell->caloDDE() ) local_cell_copy.push_back( cell );
if ( cell && cell->caloDDE() ) {
LArBadChannel bc = badchannel.offlineStatus(cell->ID());
bool good(true);
if (! bc.good() ){
// cell has some specific problems
if ( bc.unstable() ) good=false;
if ( bc.highNoiseHG() ) good=false;
if ( bc.highNoiseMG() ) good=false;
if ( bc.highNoiseLG() ) good=false;
if ( bc.problematicForUnknownReason() ) good=false;
}
if ( good ) local_cell_copy.push_back( cell );
}
} // end of loop over cells
} // end of loop over collection
......
......@@ -999,17 +999,17 @@ HLT_e5_dnntight_L1EM3:
2: 10
3: 12
HLT_e5_etcut_L1eEM3:
eventCount: 34
eventCount: 36
stepCounts:
0: 46
1: 39
2: 34
3: 34
stepFeatures:
0: 332
1: 303
2: 177
3: 239
1: 38
2: 36
3: 36
stepFeatures:
0: 329
1: 283
2: 161
3: 214
HLT_e5_idperf_gsf_tight_L1EM3:
eventCount: 11
stepCounts:
......@@ -1762,7 +1762,7 @@ HLT_j0_DIJET20j12etXX110djmass_L1J20:
stepCounts:
0: 13
stepFeatures:
0: 57
0: 55
HLT_j0_DIJET20j12etXX110djmass_PTRANGE2r3_L1J20:
eventCount: 5
stepCounts:
......@@ -1774,7 +1774,7 @@ HLT_j0_DIJET20j12ptXX110djmass_L1J20:
stepCounts:
0: 13
stepFeatures:
0: 57
0: 55
HLT_j0_DIJET20j12ptXX110djmass_PTRANGE2r3_L1J20:
eventCount: 5
stepCounts:
......@@ -1992,13 +1992,13 @@ HLT_j15_320eta490_L1RD0_FILLED:
stepFeatures:
0: 12
HLT_j15_pf_ftf_L1RD0_FILLED:
eventCount: 46
eventCount: 47
stepCounts:
0: 50
1: 46
1: 47
stepFeatures:
0: 50
1: 220
1: 221
HLT_j165_LArPEBHLT_L1J100:
eventCount: 0
HLT_j175_0eta290_020jvt_pf_ftf_bdl1r60_j60_0eta290_020jvt_pf_ftf_bdl1r60_L1J100:
......@@ -2404,10 +2404,10 @@ HLT_j45_pf_ftf_preselj20_L1J15:
HLT_j45_pf_ftf_preselj20_L1RD0_FILLED:
eventCount: 16
stepCounts:
0: 45
0: 44
1: 16
stepFeatures:
0: 45
0: 44
1: 25
HLT_j45_pf_nojcalib_ftf_L1J15:
eventCount: 12
......@@ -2510,7 +2510,7 @@ HLT_j45_subresjesgsc_ftf_L1J15:
1: 17
stepFeatures:
0: 22
1: 25
1: 24
HLT_j460_a10_lcw_subjes_L1J100:
eventCount: 0
HLT_j460_a10_lcw_subjes_L1J20:
......@@ -2670,7 +2670,7 @@ HLT_j80_j60_SHARED_j40__L1J15:
stepCounts:
0: 2
stepFeatures:
0: 13
0: 12
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1MU14FCH:
......@@ -2772,19 +2772,19 @@ HLT_j85_a10sd_cssk_pf_jes_ftf_L1J20:
0: 16
1: 12
HLT_j85_a10sd_cssk_pf_nojcalib_ftf_L1J20:
eventCount: 6
eventCount: 5
stepCounts:
0: 16
1: 6
1: 5
stepFeatures:
0: 16
1: 7
1: 6
HLT_j85_a10t_lcw_jes_L1J20:
eventCount: 13
stepCounts:
0: 13
stepFeatures:
0: 24
0: 23
HLT_j85_a10t_lcw_nojcalib_L1J20:
eventCount: 11
stepCounts:
......@@ -4027,23 +4027,23 @@ HLT_noalg_L1cTAU20M:
HLT_noalg_L1cTAU25M:
eventCount: 0
HLT_noalg_L1eEM10L:
eventCount: 3
eventCount: 2
HLT_noalg_L1eEM15:
eventCount: 11
HLT_noalg_L1eEM15L:
eventCount: 1
eventCount: 2
HLT_noalg_L1eEM15M:
eventCount: 0
HLT_noalg_L1eEM20:
eventCount: 7
HLT_noalg_L1eEM20L:
eventCount: 1
eventCount: 0
HLT_noalg_L1eEM20M:
eventCount: 0
HLT_noalg_L1eEM22:
eventCount: 7
HLT_noalg_L1eEM22L:
eventCount: 1
eventCount: 0
HLT_noalg_L1eEM22M:
eventCount: 0
HLT_noalg_L1eEM22T:
......@@ -4051,11 +4051,11 @@ HLT_noalg_L1eEM22T:
HLT_noalg_L1eEM3:
eventCount: 50
HLT_noalg_L1eEM5:
eventCount: 40
eventCount: 42
HLT_noalg_L1eEM8:
eventCount: 22
HLT_noalg_L1eEM8L:
eventCount: 3
eventCount: 2
HLT_noalg_L1eEM8M:
eventCount: 0
HLT_noalg_L1eTAU100:
......
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