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

CalibNtupleAnalysisAlg: flake8 fixes 

flake8 testing was enabled in !31551 but due to to a typo it never ran.
Fix typo and make the files compliant.
parent 12f235c5
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!32493CalibNtupleAnalysisAlg: flake8 fixes
Hide whitespace changes
Inline Side-by-side
MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt
+ 1
− 1
View file @ 076c84b8
......@@ -57,7 +57,7 @@ atlas_add_dictionary( CalibNtupleAnalysisAlgDict
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GoodRunsListsLib GeoPrimitives GaudiKernel MagFieldElements MagFieldConditions MdtCalibData MdtCalibIOSvcLib MuonCalibStandAloneBaseLib MuonIdHelpersLib StoreGateLib SGtests EventInfo MdtCalibFitters MdtCalibRt MuonCalibEventBase MuonCalibITools MuonCalibIdentifier CalibNtupleReader MuonReadoutGeometry CalibNtupleAnalysisAlgLib )
# Install files from the package:
atlas_install_python_modules( python/*.py OST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
atlas_add_test( flake8_share
......
MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/python/CalibNtupleAnalysisConfig.py
+ 49
− 40
View file @ 076c84b8
......@@ -2,20 +2,28 @@
from __future__ import print_function
from CalibNtupleAnalysisAlg.CalibNtupleAnalysisAlgConf import *
from MuonCalibStandAloneBase.MuonCalibStandAloneBaseConf import *
from MdtCalibIOSvc.MdtCalibIOSvcConf import *
from MuonCalibStandAloneTools.MuonCalibStandAloneToolsConf import *
from MuonCalibStandAloneTools.MuonCalibStandAloneToolsConfig import *
from CalibNtupleAnalysisAlg.CalibNtupleAnalysisAlgConf import (MuonCalib__ApplyRawTimes,
MuonCalib__CalibNtupleAnalysisAlg2,
MuonCalib__CalibNtupleLoader,
MuonCalib__UpdateBField,
MuonCalib__GoodRunListFilter,
MuonCalib__InitialDqFilter,
MuonCalib__BarrelSecondCoordinatePreparationTool,
MuonCalib__SegmentRawdataSelector,
MuonCalib__SegmentRefitter,
MuonCalib__SegmentRecalibration,
MuonCalib__SegmentRegionSelector)
from MuonCalibStandAloneBase.MuonCalibStandAloneBaseConf import MuonCalib__CalibrationTeeIOTool, RegionSelectionSvc
from MdtCalibIOSvc.MdtCalibIOSvcConf import MdtCalibOutputDbSvc, MdtCalibInputSvc, MuonCalib__CalibrationFileIOTool
from MuonCalibDbOperations.MuonCalibDbOperationsConf import MuonCalib__CalibrationDbIOTool
from AthenaCommon.AppMgr import ServiceMgr, ToolSvc
from AthenaCommon.AlgSequence import AlgSequence
from CalibNtupleAnalysisAlg.CalibNtupleMetaData import *
from CalibNtupleAnalysisAlg.CalibNtupleMetaData import CalibNtupleMetaData
import MuonCalibStandAloneTools.MuonCalibStandAloneToolsConfig as calibtools
import sys
#ToolSvc = Service( "ToolSvc" )
class CalibNtupleAnalysisConfig:
#--------------------------------------user settings----------------------------
......@@ -31,9 +39,9 @@ class CalibNtupleAnalysisConfig:
# event display Display
# rpc timing RpcTiming
# control histograms ControlHistograms
CalibrationAlgorithm = "RunScan"
#file list
FileList="fl.txt"
......@@ -49,7 +57,7 @@ class CalibNtupleAnalysisConfig:
#select segment author - 3=MuonBoy 4=Moore - Unused if SegmentsFromRawdata=True
SegmentAuthor=4
#first and last event to analyse
FirstEvent=0
LastEvent=-1
......@@ -71,7 +79,7 @@ class CalibNtupleAnalysisConfig:
MaxSegmentHits = -1
#perform a segment refit - not for algorithms likr MTT0, Integration, RunScan..
SegmentRefit=False;
SegmentRefit=False
#segment refit parameters
RefineT0=False
......@@ -80,7 +88,7 @@ class CalibNtupleAnalysisConfig:
RefitTimeOut=2
RefitMinSegmentHits=4
RefitMaxSegmentHits=-1
#calibrate with b-field
BFieldCorrection=False
......@@ -103,25 +111,25 @@ class CalibNtupleAnalysisConfig:
#output to database - MP/RM/MI/NONE
CalibDB=None
#initial data quality list - suppress Tubes
InitialDQList = None
#if set to true no segment recalibraiton will be done, independent on the tool
SuppressRecalibration=False
#use good run list to filter events
GoodRunList=None
#apply time slewing corrections
ApplyTimeSlewingCorrections=False
#apply multilayer rt-scaling
ApplyRtScaling=True
sToolSvc= ToolSvc
sServiceMgr = ServiceMgr
SegmentRecalibration={}
SegmentRefitter={}
......@@ -151,6 +159,7 @@ class CalibNtupleAnalysisConfig:
self._initial_DQ_list()
#apply RPC Timing Correction
if self.RPCTimingCorr:
from CalibNtupleAnalysisAlg.CalibNtupleAnalysisAlgConf import MuonCalib__RpcTimingCorr
self.RpcTiming=MuonCalib__RpcTimingCorr()
self.sToolSvc += self.RpcTiming
self.CalibNtupleAnalysisAlg.CalibSegmentPreparationTools.append(self.RpcTiming)
......@@ -172,13 +181,13 @@ class CalibNtupleAnalysisConfig:
self._config_calibIO()
#create tool
self._create_calib_tool()
#-----------------------protected functions------------------------------------
def _create_CalibNtupleAnalysisAlg(self):
topSequence = AlgSequence()
self.CalibNtupleAnalysisAlg = MuonCalib__CalibNtupleAnalysisAlg2()
self.CalibNtupleAnalysisAlg.NumberOfSegments = self.NumberOfSegments
if self.CalibrationAlgorithm in LimitSegmentsFor:
if self.CalibrationAlgorithm in calibtools.LimitSegmentsFor:
self.CalibNtupleAnalysisAlg.NumberOfSegments = self.AutoLimitSegments
topSequence += self.CalibNtupleAnalysisAlg
......@@ -195,7 +204,7 @@ class CalibNtupleAnalysisConfig:
self.CalibNtupleAnalysisAlg.CalibSegmentPreparationTools.append( self.__good_run_list_filter )
# self.__good_run_list_tool.EventSelectorMode = True
self.__good_run_list_tool.PassThrough = False
def _initial_DQ_list(self):
if self.InitialDQList:
if self.InitialDQList.upper()=="NONE":
......@@ -204,7 +213,7 @@ class CalibNtupleAnalysisConfig:
self.InitialDqFilter.InitialDqFile = self.InitialDQList
self.sToolSvc += self.InitialDqFilter
self.CalibNtupleAnalysisAlg.CalibSegmentPreparationTools.append( self.InitialDqFilter)
def _region_selection(self):
if self.SegmentsFromRawdata:
self.RegionSelection = MuonCalib__SegmentRawdataSelector()
......@@ -226,10 +235,10 @@ class CalibNtupleAnalysisConfig:
self.BarrelSecondCoordinatePreparationTool = MuonCalib__BarrelSecondCoordinatePreparationTool()
self.sToolSvc += self.BarrelSecondCoordinatePreparationTool
self.CalibNtupleAnalysisAlg.CalibSegmentPreparationTools.append( self.BarrelSecondCoordinatePreparationTool)
def _configure_segment_recalibration(self, ToolName=""):
#tools that do not need segment recalibration
if self.CalibrationAlgorithm in NoRecalibration:
if self.CalibrationAlgorithm in calibtools.NoRecalibration:
return
if ToolName:
self.SegmentRecalibration[ToolName] = MuonCalib__SegmentRecalibration(ToolName)
......@@ -243,39 +252,39 @@ class CalibNtupleAnalysisConfig:
else:
self.SegmentRecalibration[ToolName].TimeSlewingSwitch='UNAPPLY'
#tools that revert all calibrations
if self.CalibrationAlgorithm in RevertT0:
if self.CalibrationAlgorithm in calibtools.RevertT0:
self.SegmentRecalibration[ToolName].T0Switch = "UNAPPLY"
self.SegmentRecalibration[ToolName].BSwitch = "LEAVE"
self.SegmentRecalibration[ToolName].RecalcR = False
if self.CalibrationAlgorithm in RecalibT0 :
if self.CalibrationAlgorithm in calibtools.RecalibT0 :
self.SegmentRecalibration[ToolName].T0Switch = "FILE"
self.SegmentRecalibration[ToolName].BSwitch = "LEAVE"
self.SegmentRecalibration[ToolName].RecalcR = False
if self.CalibrationAlgorithm in RecalibAll:
if self.CalibrationAlgorithm in calibtools.RecalibAll:
self.SegmentRecalibration[ToolName].T0Switch = "FILE"
self.SegmentRecalibration[ToolName].BSwitch = "LEAVE"
self.SegmentRecalibration[ToolName].RecalcR = True
#id b-field should be corrected, set BSwitch either to "UNAPPLY" or to "FILE"
if self.CalibrationAlgorithm in RevertRtScaling:
if self.CalibrationAlgorithm in calibtools.RevertRtScaling:
self.SegmentRecalibration[ToolName].RtMultilayerScaling = "UNAPPLY"
if self.CalibrationAlgorithm in ApplRtScaling and self.ApplyRtScaling:
if self.CalibrationAlgorithm in calibtools.ApplRtScaling and self.ApplyRtScaling:
self.SegmentRecalibration[ToolName].RtMultilayerScaling = "FILE"
if self.BFieldCorrection:
if self.SegmentRecalibration[ToolName].RecalcR:
self.SegmentRecalibration[ToolName].BSwitch = "FILE"
# else:
# self.SegmentRecalibration[ToolName].BSwitch = "UNAPPLY"
def _config_UpdateBField(self):
if self.UpdateBField in NoSegmentRefit:
if self.UpdateBField in calibtools.NoSegmentRefit:
self.UpdateBField = None
return
self.UpdateBField = MuonCalib__UpdateBField()
self.sToolSvc += self.UpdateBField
self.CalibNtupleAnalysisAlg.CalibSegmentPreparationTools.append( self.UpdateBField )
def _config_segment_refitter(self, ToolName=""):
if self.CalibrationAlgorithm in NoSegmentRefit:
if self.CalibrationAlgorithm in calibtools.NoSegmentRefit:
return
if ToolName:
self.SegmentRefitter[ToolName] = MuonCalib__SegmentRefitter(ToolName)
......@@ -290,7 +299,7 @@ class CalibNtupleAnalysisConfig:
self.SegmentRefitter[ToolName].TimeOut = self.RefitTimeOut
self.SegmentRefitter[ToolName].MinSegmentHits = self.RefitMinSegmentHits
self.SegmentRefitter[ToolName].MaxSegmentHits = self.RefitMaxSegmentHits
def _config_calibIO(self):
if self.CalibDir:
self.CalibrationFileIOTool = MuonCalib__CalibrationFileIOTool()
......@@ -302,7 +311,7 @@ class CalibNtupleAnalysisConfig:
if not self.__set_db():
print ("Unknown database location " + str(self.CalibOutputDB))
sys.exit(1)
self.MdtCalibOutputDbSvc = MdtCalibOutputDbSvc()
self.MdtCalibOutputDbSvc.PostprocessCalibration = True
self.sServiceMgr += self.MdtCalibOutputDbSvc
......@@ -332,16 +341,16 @@ class CalibNtupleAnalysisConfig:
self.MdtCalibInputSvc.CalibrationInputTool = self.CalibrationFileIOTool
def _create_calib_tool(self):
self.CalibrationTool=CreateCalibTool(self.CalibrationAlgorithm)
self.CalibrationTool=calibtools.CreateCalibTool(self.CalibrationAlgorithm)
if self.CalibrationTool:
self.sToolSvc += self.CalibrationTool
self.CalibNtupleAnalysisAlg.CalibrationTool = self.CalibrationTool
#------------------------------------------------------------
def __set_db(self):
self.DbIoTool.SiteName = self.CalibDB
self.DbIoTool.UseValidaedT0 = self.CalibrationAlgorithm in ValidatedT0
self.DbIoTool.UseValidaedRt = self.CalibrationAlgorithm in ValidatedRt
self.DbIoTool.UseValidaedT0 = self.CalibrationAlgorithm in calibtools.ValidatedT0
self.DbIoTool.UseValidaedRt = self.CalibrationAlgorithm in calibtools.ValidatedRt
if (self.CalibDB == "MP"):
self.DbIoTool.ConnectionString = "oracle://oracle01.mppmu.mpg.de/ATLMPI.mppmu.mpg.de/ATLAS_MUONCALIB_MPI"
self.DbIoTool.WorkingSchema = "ATLAS_MUONCALIB_MPI"
......
MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/python/CalibNtupleMetaData.py
+ 5
− 5
View file @ 076c84b8
......@@ -2,11 +2,11 @@
from __future__ import print_function
from ROOT import TFile, TTree
from ROOT import TFile
import sys
class CalibNtupleMetaData:
def __init__(self, filelist):
self.MetaData={}
fl=file(filelist)
......@@ -27,16 +27,16 @@ class CalibNtupleMetaData:
if not inf:
sys.stderr.write("CalibNtupleMetaData WARNING: cannot open first file in filelist\n")
continue
if not inf:
sys.stderr.write("CalibNtupleMetaData WARNING: find an input file in filelist\n")
return
tree=inf.Get("meta_data")
if not tree:
sys.stderr.write("CalibNtupleMetaData WARNING: input file does not contain meta_data\n")
return
i=0
while tree.GetEntry(i):
i+=1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment