Commit 2ee22263 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'manualSweep5148' into 'master'

Manual sweep 5148

See merge request atlas/athena!24760
parents 8b8db841 ea8aa1ec
......@@ -19,6 +19,8 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArCabling
LArCalorimeter/LArElecCalib
LArCalorimeter/LArIdentifier
LArCalorimeter/LArRecUtils
LArCalorimeter/LArTools
Trigger/TrigAnalysis/TrigDecisionTool
PRIVATE
Calorimeter/CaloConditions
......@@ -47,5 +49,5 @@ atlas_add_component( CaloCondPhysAlgs
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
atlas_install_scripts( share/CaloRescaleNoiseHV.sh share/CaloNoise_fillDB.py share/CaloPedestalShift.sh share/CaloPedestal_fillDB.py )
atlas_install_scripts( share/CaloRescaleNoiseHV.sh share/CaloNoise_fillDB.py share/CaloPedestalShift.sh share/CaloPedestal_fillDB.py share/CaloScaleNoise_jobOptions.py )
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARHVMAPTOOL_H
#define LARHVMAPTOOL_H
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "LArCabling/LArHVCablingTool.h"
class CaloDetDescrManager;
class Identifier;
class CaloIdManager;
class LArEM_ID;
class LArHEC_ID;
class LArFCAL_ID;
//class LArHVCablingTool;
static const InterfaceID IID_LArHVMapTool("LArHVMapTool", 1 ,0);
class LArHVMapTool: public AthAlgTool
{
public:
LArHVMapTool(const std::string& type, const std::string& name,
const IInterface* parent);
virtual ~LArHVMapTool(){};
static const InterfaceID& interfaceID() { return IID_LArHVMapTool; }
virtual StatusCode initialize();
virtual StatusCode execute();
virtual StatusCode finalize(){return StatusCode::SUCCESS;}
std::vector<int> GetHVLines(const Identifier& id);
private:
const DataHandle<CaloIdManager> m_caloIdMgr;
const DataHandle<CaloDetDescrManager> m_calodetdescrmgr;
const LArEM_ID* m_larem_id;
const LArHEC_ID* m_larhec_id;
const LArFCAL_ID* m_larfcal_id;
ToolHandle<LArHVCablingTool> m_hvCablingTool;
};
#endif
......@@ -71,7 +71,7 @@ svcMgr.IOVDbSvc.GlobalTag = GlobalTag
from IOVDbSvc.CondDB import conddb
conddb.blockFolder("/LAR/LArCellPositionShift")
conddb.addFolder("","<dbConnection>"+InputDB+"</dbConnection>"+Folder+"<tag>"+FolderTag+"</tag>")
conddb.addFolder("","<dbConnection>"+InputDB+"</dbConnection>"+Folder+"<tag>"+FolderTag+"</tag>",True)
#--------------------------------------------------------------
# Private Application Configuration options
#--------------------------------------------------------------
......
......@@ -71,6 +71,7 @@ include( "TileIdCnv/TileIdCnv_jobOptions.py" )
include( "LArDetDescr/LArDetDescr_joboptions.py" )
include("TileConditions/TileConditions_jobOptions.py" )
include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
conddb.blockFolder("/LAR/LArCellPositionShift")
conddb.blockFolder("/LAR/LArCellPositionShift")
......
......@@ -69,9 +69,6 @@ include( "LArDetDescr/LArDetDescr_joboptions.py" )
include("TileConditions/TileConditions_jobOptions.py" )
include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
if "folderTag" in dir():
conddb.addOverride("/LAR/NoiseOfl/CellNoise",folderTag)
svcMgr.IOVDbSvc.GlobalTag = GlobalTag
from CaloTools.CaloNoiseToolDefault import CaloNoiseToolDefault
......@@ -79,6 +76,12 @@ theCaloNoiseTool = CaloNoiseToolDefault()
theCaloNoiseTool.RescaleForHV=False
ToolSvc += theCaloNoiseTool
if "dbNoise" in dir():
conddb.addMarkup("/LAR/NoiseOfl/CellNoise","<db>"+dbNoise+"</db>")
if "folderTag" in dir():
conddb.addOverride("/LAR/NoiseOfl/CellNoise",folderTag)
#--------------------------------------------------------------
# Private Application Configuration options
#--------------------------------------------------------------
......
......@@ -7,7 +7,7 @@ def usage():
print "Syntax for UPD4 open-end IoV noise update"
print " The first parameter is the run number of IoV start, the second parameter is the lumiblock number for IoV start"
print " The third and fourth parameter are the Run/lb for IoV end (if run is -1, uses open ended IoV)"
print " The fith parameter is the upd4 tag name"
print " The fifth parameter is the upd4 tag name"
print " The sixth parameter is input text file name (default calonoise.txt)"
print " The seventh parameter is output sqlite file name (default caloSqlite.db)"
print " The eigth parameter is output DB name (default CONDBR2)"
......@@ -25,12 +25,15 @@ lbkSince = sys.argv[2]
runUntil = sys.argv[3]
lbkUntil = sys.argv[4]
tag = sys.argv[5]
if len(sys.argv)>=6:
if len(sys.argv)>6:
inputFile=sys.argv[6]
else:
inputFile="calonoise.txt"
if len(sys.argv)>7:
filename=sys.argv[7]
else:
filename="larnoisesqlite.db"
if len(sys.argv)>8:
dbname=sys.argv[8]
......@@ -43,8 +46,8 @@ else:
folderPath = "/LAR/NoiseOfl/CellNoise"
if len(sys.argv)>10:
mu = int(sys.argv[10])
else:
mu = int(sys.argv[10]
else:
mu = -1
if len(sys.argv)>11:
......@@ -52,10 +55,16 @@ if len(sys.argv)>11:
else:
dt = -1
if len(sys.argv)>11:
dt = int(sys.argv[11])
else:
dt = -1
print "input: ",inputFile
print "runUntil ", runUntil, lbkUntil
print "output:",filename
print "input: ",inputFile
import ROOT
import cppyy
......@@ -187,6 +196,13 @@ try:
noiseB /= math.sqrt(mu/29.*10.)
pass
flt.setData(hash,gain,0,noiseA)
if mu > 0 and dt > 0:
# new normalization
if dt > 25:
noiseB /= math.sqrt(mu/53.*10.)
else:
noiseB /= math.sqrt(mu/29.*10.)
pass
flt.setData(hash,gain,1,noiseB)
#=== write to DB
......
......@@ -40,10 +40,10 @@ if "RunNumberOld" not in dir():
if "GlobalTag" not in dir():
GlobalTag = 'COMCOND-BLKPA-2014-02'
GlobalTag = 'COMCOND-BLKPA-2017-09'
if "Geometry" not in dir():
Geometry = 'ATLAS-R2-2015-02-00-00'
Geometry = 'ATLAS-R2-2015-04-00-00'
from RecExConfig.RecFlags import rec
rec.RunNumber.set_Value_and_Lock(int(RunNumberOld))
......
......@@ -54,10 +54,10 @@ if "dt" not in dir():
print "Using dt: ",dt
if "GlobalTag" not in dir():
GlobalTag = 'COMCOND-BLKPA-2015-05'
GlobalTag = 'COMCOND-BLKPA-2017-09'
if "Geometry" not in dir():
Geometry = 'ATLAS-R2-2015-02-00-00'
Geometry = 'ATLAS-R2-2015-04-00-00'
from RecExConfig.RecFlags import rec
rec.RunNumber.set_Value_and_Lock(int(RunNumberOld))
......@@ -120,12 +120,19 @@ if "sqliteHVCorr" in dir():
conddb.addMarkup("/LAR/ElecCalibFlat/HVScaleCorr","<db>sqlite://;schema="+sqliteHVCorr+";dbname=CONDBR2</db>")
if mu==0:
conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc0_25ns")
#conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc0_25ns")
# for 2017:
conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise-mc16-ofc25mc15mu0-25ns-A3MinBias_1phi_v2")
else:
if dt==25:
conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc25mu20_25ns")
#conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc25mu20_25ns")
# for the 2017 running:
conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise-mc16-ofc25mc15mu20-25ns-A3MinBias_1phi_v2")
else:
conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc25mu20_50ns")
#conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc25mu20_50ns")
# not possible for 2017:
print "Could not handle 50ns in 2017"
sys.exit(-1)
from CaloTools.CaloNoiseToolDefault import CaloNoiseToolDefault
theCaloNoiseTool = CaloNoiseToolDefault()
......
......@@ -9,13 +9,14 @@ sqlite="EMB-EMEC_PS_CellEnergyCorrection.db"
# write here the run number and lumiblock of a time after temperature drop
RunNumber = 212393
RunNumber = 275429
LumiBlock = 1
#LastRunNumber = 999999
GlobalTag = 'COMCOND-ES1PA-006-02'
Geometry = 'ATLAS-GEO-18-00-00'
#GlobalTag = 'COMCOND-ES1PA-006-02'
GlobalTag = 'CONDBR2-ES1PA-2017-09'
Geometry = 'ATLAS-R2-2015-04-00-00'
from RecExConfig.RecFlags import rec
rec.RunNumber.set_Value_and_Lock(RunNumber)
......@@ -23,7 +24,7 @@ rec.RunNumber.set_Value_and_Lock(RunNumber)
from PyCool import cool
from CoolConvUtilities.AtlCoolLib import indirectOpen
trigDB=indirectOpen('COOLONL_TRIGGER/COMP200',oracle=True)
trigDB=indirectOpen('COOLONL_TRIGGER/CONDBR2',oracle=True)
trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
runiov=(RunNumber << 32)+ LumiBlock
print " runiov ", runiov
......@@ -144,7 +145,7 @@ theOutputConditionsAlg.LB1 = 1
#theOutputConditionsAlg.Run2 = LastRunNumber + 1
#theOutputConditionsAlg.LB2 = 0
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=CONDBR2"
from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
svcMgr += IOVRegistrationSvc()
svcMgr.IOVRegistrationSvc.RecreateFolders = True #Allow add in a second tag
......
......@@ -9,13 +9,13 @@ sqlite="EMB_EMEC_PS_800HV_CellEnergyCorrection.db"
# write here the run number and lumiblock of a time after temperature drop
RunNumber = 212588
RunNumber = 274936
LumiBlock = 1
#LastRunNumber = 999999
GlobalTag = 'COMCOND-ES1PA-006-02'
Geometry = 'ATLAS-GEO-18-00-00'
GlobalTag = 'CONDBR2-ES1PA-2017-09'
Geometry = 'ATLAS-R2-2015-04-00-00'
from RecExConfig.RecFlags import rec
rec.RunNumber.set_Value_and_Lock(RunNumber)
......@@ -23,7 +23,7 @@ rec.RunNumber.set_Value_and_Lock(RunNumber)
from PyCool import cool
from CoolConvUtilities.AtlCoolLib import indirectOpen
trigDB=indirectOpen('COOLONL_TRIGGER/COMP200',oracle=True)
trigDB=indirectOpen('COOLONL_TRIGGER/CONDBR2',oracle=True)
trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
runiov=(RunNumber << 32)+ LumiBlock
print " runiov ", runiov
......@@ -107,6 +107,10 @@ theRescaler.HVvalues = [ 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992,
topSequence += theRescaler
from CaloCondPhysAlgs.CaloCondPhysAlgsConf import LArHVMapTool
theLArHV=LArHVMapTool("LArHVMapTool")
ToolSvc += theLArHV
#--------------------------------------------------------------
#--- Dummy event loop parameters
#--------------------------------------------------------------
......@@ -146,7 +150,7 @@ theOutputConditionsAlg.LB1 = 1
#theOutputConditionsAlg.Run2 = LastRunNumber + 1
#theOutputConditionsAlg.LB2 = 0
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=CONDBR2"
from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
svcMgr += IOVRegistrationSvc()
svcMgr.IOVRegistrationSvc.RecreateFolders = True #Allow add in a second tag
......
......@@ -34,7 +34,7 @@
#include "CoolKernel/types.h"
#include "CoolKernel/Record.h"
#include "CoralBase/AttributeListSpecification.h"
#include "CaloCondPhysAlgs/LArHVMapTool.h"
CaloCellCalcEnergyCorr::CaloCellCalcEnergyCorr( const std::string& name,
ISvcLocator* pSvcLocator ) :
......
......@@ -491,8 +491,8 @@ StatusCode CaloCellNoiseAlg::fitNoise()
for (int phi=phimin;phi<=phimax;phi++) {
Identifier id2 = m_calo_id->cell_id(regionId,eta,phi);
if (id2.is_valid()) {
if(msgLvl(MSG::DEBUG))
msg() << MSG::DEBUG << " cell in ring " << m_calo_id->show_to_string(id2) ;
if(msgLvl(MSG::DEBUG))
msg() << MSG::DEBUG << " cell in ring " << m_calo_id->show_to_string(id2) ;
IdentifierHash idHash2 = m_calo_id->calo_cell_hash(id2);
int index = (int)(idHash2);
if (index>=0 && index<m_ncell) {
......
......@@ -25,6 +25,7 @@ CaloCellPosition2Ntuple::CaloCellPosition2Ntuple(const std::string& name, ISvcLo
m_dx(0),
m_dy(0),
m_dz(0),
m_volume(0),
m_tree(NULL)
{
declareProperty("inputKey",m_key,"Key for CaloCellPositionShift");
......@@ -57,6 +58,7 @@ StatusCode CaloCellPosition2Ntuple::initialize()
m_tree->Branch("dx",&m_dx,"DeltaX/F");
m_tree->Branch("dy",&m_dy,"DeltaY/F");
m_tree->Branch("dz",&m_dz,"DeltaZ/F");
m_tree->Branch("volume",&m_volume,"volume/F");
ATH_CHECK( m_thistSvc->regTree("/file1/cellpos/mytree",m_tree) );
......@@ -105,6 +107,7 @@ StatusCode CaloCellPosition2Ntuple::stop()
m_dx = m_cellPos->deltaX(i);
m_dy = m_cellPos->deltaY(i);
m_dz = m_cellPos->deltaZ(i);
m_volume = calodde->volume();
m_tree->Fill();
......
......@@ -63,6 +63,7 @@ class CaloCellPosition2Ntuple : public AthAlgorithm {
float m_dx;
float m_dy;
float m_dz;
float m_volume;
TTree* m_tree;
};
......
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloCondPhysAlgs/LArHVMapTool.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloDetDescr/CaloDetectorElements.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "LArHV/EMBHVElectrode.h"
#include "LArHV/EMBPresamplerHVModule.h"
#include "LArHV/EMECHVElectrode.h"
#include "LArHV/EMECPresamplerHVModule.h"
#include "LArHV/HECHVSubgap.h"
#include "LArHV/FCALHVLine.h"
#include "LArReadoutGeometry/EMECCell.h"
#include "LArReadoutGeometry/HECCell.h"
#include "LArReadoutGeometry/EMBCell.h"
#include "LArReadoutGeometry/FCALTile.h"
#include "LArReadoutGeometry/EMBCellConstLink.h"
#include "LArReadoutGeometry/EMECCellConstLink.h"
#include "LArReadoutGeometry/HECCellConstLink.h"
#include "LArReadoutGeometry/FCALTubeConstLink.h"
#include "LArHV/LArHVManager.h"
LArHVMapTool::LArHVMapTool(const std::string& type, const std::string& name, const IInterface* parent)
: AthAlgTool(type,name,parent)
{
declareInterface<LArHVMapTool>( this );
}
StatusCode LArHVMapTool::initialize(){
CHECK(detStore()->retrieve(m_caloIdMgr));
m_larem_id = m_caloIdMgr->getEM_ID();
m_larhec_id = m_caloIdMgr->getHEC_ID();
m_larfcal_id = m_caloIdMgr->getFCAL_ID();
CHECK(detStore()->retrieve(m_calodetdescrmgr));
return StatusCode::SUCCESS;
}
StatusCode LArHVMapTool::execute() {
CHECK(m_hvCablingTool.retrieve());
IdentifierHash h=0;
Identifier offId;
m_larem_id->get_id(h,offId);
std::vector<int> hvlineId = GetHVLines(offId);
//std::cout<<"LArHVMapTool::execute "<<offId.getString()<<" : "<<hvlineId.size()<<std::endl;
//if(hvlineId.size()>0) std::cout<<hvlineId[0]<<std::endl;
return StatusCode::SUCCESS;
}
std::vector<int> LArHVMapTool::GetHVLines(const Identifier& id) {
std::set<int> hv;
int counter=0;
// LAr EMB
if (m_larem_id->is_lar_em(id) && m_larem_id->sampling(id)>0) {
if (abs(m_larem_id->barrel_ec(id))==1) {
const EMBDetectorElement* embElement = dynamic_cast<const EMBDetectorElement*>(m_calodetdescrmgr->get_element(id));
if (embElement) {
const EMBCellConstLink cell = embElement->getEMBCell();
unsigned int nelec = cell->getNumElectrodes();
for (unsigned int i=0;i<nelec;i++) {
const EMBHVElectrode& electrode = cell->getElectrode(i);
for (unsigned int igap=0;igap<2;igap++) {
hv.insert(electrode.hvLineNo(igap));
}
}
}
else {
ATH_MSG_ERROR( "Failed d'cast to EMBDetectorElement" );
}
} else { // LAr EMEC
const EMECDetectorElement* emecElement = dynamic_cast<const EMECDetectorElement*>(m_calodetdescrmgr->get_element(id));
if (emecElement) {
const EMECCellConstLink cell = emecElement->getEMECCell();
unsigned int nelec = cell->getNumElectrodes();
for (unsigned int i=0;i<nelec;i++) {
const EMECHVElectrode& electrode = cell->getElectrode(i);
for (unsigned int igap=0;igap<2;igap++) hv.insert(electrode.hvLineNo(igap));
}
}
else {
ATH_MSG_ERROR( "Failed d'cast to EMECDetectorElement" );
}
}
} else if (m_larhec_id->is_lar_hec(id)) { // LAr HEC
const HECDetectorElement* hecElement = dynamic_cast<const HECDetectorElement*>(m_calodetdescrmgr->get_element(id));
if (hecElement) {
const HECCellConstLink cell = hecElement->getHECCell();
unsigned int nsubgaps = cell->getNumSubgaps();
for (unsigned int igap=0;igap<nsubgaps;igap++) {
const HECHVSubgap& subgap = cell->getSubgap(igap);
hv.insert(subgap.hvLineNo());
}
}
else {
ATH_MSG_ERROR( "Failed d'cast to HECDetectorElement" );
}
} else if (m_larfcal_id->is_lar_fcal(id)) { // LAr FCAL
const FCALDetectorElement* fcalElement = dynamic_cast<const FCALDetectorElement*>(m_calodetdescrmgr->get_element(id));
if (fcalElement) {
const FCALTile* tile = fcalElement->getFCALTile();
unsigned int nlines = tile->getNumHVLines();
unsigned int nlines_found=0;
for (unsigned int i=0;i<nlines;i++) {
const FCALHVLine* line = tile->getHVLine(i);
if (line) nlines_found++;
}
if ( nlines_found>0 ) {
for (unsigned int i=0;i<nlines;i++) {
const FCALHVLine* line = tile->getHVLine(i);
if (!line) continue;
hv.insert(line->hvLineNo());
}
}
}
else {
ATH_MSG_ERROR( "Failed d'cast to FCALDetectorElement" );
}
} else if (m_larem_id->is_lar_em(id) && m_larem_id->sampling(id)==0) { // Presamplers
if (abs(m_larem_id->barrel_ec(id))==1) {
const EMBDetectorElement* embElement = dynamic_cast<const EMBDetectorElement*>(m_calodetdescrmgr->get_element(id));
if (embElement) {
const EMBCellConstLink cell = embElement->getEMBCell();
const EMBPresamplerHVModule& hvmodule = cell->getPresamplerHVModule();
for (unsigned int igap=0;igap<2;igap++) hv.insert(hvmodule.hvLineNo(igap));
}
else {
ATH_MSG_ERROR( "Failed d'cast to EMBDetectorElement (for presampler)" );
}
} else {
const EMECDetectorElement* emecElement = dynamic_cast<const EMECDetectorElement*>(m_calodetdescrmgr->get_element(id));
if (emecElement) {
const EMECCellConstLink cell = emecElement->getEMECCell();
const EMECPresamplerHVModule& hvmodule = cell->getPresamplerHVModule ();
for (unsigned int igap=0;igap<2;igap++) hv.insert(hvmodule.hvLineNo(igap));
}
else {
ATH_MSG_ERROR( "Failed d'cast to EMECDetectorElement (for presampler)" );
}
}
}
std::vector<int> hvlines;
for (std::set<int>::iterator i=hv.begin();i!=hv.end();++i) hvlines.push_back(*i);
//std::cout<<"LArHVMapTool hvlines size: "<<hvlines.size()<<std::endl;
//if(hvlines.size()>0) std::cout<<hvlines[0]<<std::endl;
return hvlines;
}
......@@ -51,6 +51,8 @@
m_tree->Branch("ncell",&m_nsymcell,"ncell/I");
m_tree->Branch("nevt_total",&m_nevt_total,"nevt_total/I");
m_tree->Branch("identifier",m_identifier,"identifier[ncell]/I");
m_tree->Branch("region",m_region,"region[ncell]/I");
m_tree->Branch("ieta",m_ieta,"ieta[ncell]/I");
m_tree->Branch("layer",m_layer,"layer[ncell]/I");
m_tree->Branch("region",m_region,"region[ncell]/I");
m_tree->Branch("ieta",m_ieta,"ieta[ncell]/I");
......@@ -157,6 +159,8 @@
const CaloDetDescrElement* calodde = m_calodetdescrmgr->get_element(id);
cell.eta = calodde->eta();
cell.phi = calodde->phi();
cell.region = m_calo_id->region(id);
cell.ieta = m_calo_id->eta(id);
cell.layer = m_calo_id->calo_sample(id);
cell.region = m_calo_id->region(id);
cell.ieta = m_calo_id->eta(id);
......@@ -171,7 +175,7 @@
}
}
ATH_MSG_INFO(" --- number of symmetric cells found " << nsym << " " << m_CellList.size());
if (nsym>=MAX_SYM_CELLS) ATH_MSG_ERROR(" More than allowed number of symmetric cells... Fix array size for ntuple writing !!!! ");
if (nsym>=MAX_SYM_CELLS) ATH_MSG_ERROR(" More than "<<MAX_SYM_CELLS<<" number of symmetric cells... Fix array size for ntuple writing !!!! ");
m_nsymcell=nsym;
m_first=false;
}
......
......@@ -81,8 +81,8 @@ inline bool LArBadChannelMasker::statusShouldBeMasked(const LArBadChannel& cellS
if(cellStatus.good())
return false;
// log << MSG::VERBOSE << "gain: " << gain << " bitMask: 0x" << MSG::hex << m_bitMask
// << " cellStatus: 0x" << cellStatus.packedData() << MSG::dec << endmsg;
ATH_MSG_VERBOSE( "gain: " << gain << " bitMask: 0x" << MSG::hex << m_bitMask
<< " cellStatus: 0x" << cellStatus.packedData() << MSG::dec );
if (gain==CaloGain::LARHIGHGAIN)
return (m_bitMask & cellStatus.packedData() & m_highGainMask) != 0;
......
......@@ -4,12 +4,15 @@ if 'OutputFile' not in dir():
if 'DBInstance' not in dir():
DBInstance="CONDBR2"
if 'DBString' not in dir():
DBString="<db>COOLOFL_LAR/"
if 'sqlite' in dir():
dbStr="<db>sqlite://;schema="+sqlite+";dbname="+DBInstance+"</db>"
if not 'tag' in dir():
tag="LARBadChannelsOflBadChannels-UPD4-00"
else:
dbStr="<db>COOLOFL_LAR/"+DBInstance+"</db>"