Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Santiago Noacco Rosende
athena
Commits
ca446166
Commit
ca446166
authored
10 years ago
by
Siarhei Harkusha
Committed by
Graeme Stewart
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fixed ATN and RTT tests (TileRecEx-00-04-22)
parent
aafde455
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
+24
-31
24 additions, 31 deletions
...er/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
with
24 additions
and
31 deletions
TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
+
24
−
31
View file @
ca446166
...
...
@@ -4,7 +4,8 @@
#
#==============================================================
from
os
import
system
,
popen
from
os
import
system
from
subprocess
import
check_output
from
AthenaCommon.AppMgr
import
theApp
svcMgr
=
theApp
.
serviceMgr
()
...
...
@@ -206,30 +207,24 @@ def FindFile(path, runinput, filter):
fullname
=
[]
if
RunFromLocal
:
for
f
in
popen
(
'
ls %(path)s | grep %(run)s | grep %(filt)s
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
}):
files
.
append
(
f
)
files
=
check_output
(
'
ls %(path)s | grep %(run)s | grep %(filt)s
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
},
shell
=
True
).
splitlines
()
elif
(
path
.
startswith
(
'
/eos/
'
)):
for
f
in
popen
(
'
xrd eosatlas dirlist %(path)s | grep %(run)s | grep -v -e
"
[ 0-9][ 0-9][0-9]
"
| grep %(filt)s | sed
"
s|^.*/||
"
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
}):
files
.
append
(
f
)
files
=
check_output
(
'
xrd eosatlas dirlist %(path)s | grep %(run)s | grep -v -e
"
[ 0-9][ 0-9][0-9]
"
| grep %(filt)s | sed
"
s|^.*/||
"
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
},
shell
=
True
).
splitlines
()
else
:
if
(
TilePhysRun
and
RunNumber
>
28000
and
RunNumber
<
40000
):
for
f
in
popen
(
'
nsls -l %(path)s | grep %(run)s | grep -v -e
"
[ 0-9][ 0-9][0-9]
"
-e
"
hlterror
"
| grep %(filt)s | grep -e
"
b0000[01][01][01][01]
"
-e
"
physics.cosmics
"
| cut -c66-
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
}):
files
.
append
(
f
)
files
=
check_output
(
'
nsls -l %(path)s | grep %(run)s | grep -v -e
"
[ 0-9][ 0-9][0-9]
"
-e
"
hlterror
"
| grep %(filt)s | grep -e
"
b0000[01][01][01][01]
"
-e
"
physics.cosmics
"
| cut -c66-
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
},
shell
=
True
).
splitlines
()
elif
(
TilePhysRun
and
RunNumber
>
40000
and
RunNumber
<
75354
):
for
f
in
popen
(
'
nsls -l %(path)s | grep %(run)s | grep -v -e
"
[ 0-9][ 0-9][0-9]
"
-e
"
hlterror
"
| grep %(filt)s | grep -e
"
NIM0
"
-e
"
[pP]hysics
"
| cut -c66-
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
}):
files
.
append
(
f
)
files
=
check_output
(
'
nsls -l %(path)s | grep %(run)s | grep -v -e
"
[ 0-9][ 0-9][0-9]
"
-e
"
hlterror
"
| grep %(filt)s | grep -e
"
NIM0
"
-e
"
[pP]hysics
"
| cut -c66-
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
},
shell
=
True
).
splitlines
()
else
:
for
f
in
popen
(
'
nsls -l %(path)s | grep %(run)s | grep -v -e
"
[ 0-9][ 0-9][0-9]
"
| grep %(filt)s | cut -c66-
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
}):
files
.
append
(
f
)
files
=
check_output
(
'
nsls %(path)s | grep %(run)s | grep -v -e
"
[ 0-9][ 0-9][0-9]
"
| grep %(filt)s
'
%
{
'
path
'
:
path
,
'
run
'
:
run
,
'
filt
'
:
filter
},
shell
=
True
).
splitlines
()
for
nn
in
range
(
len
(
files
)):
temp
=
files
[
nn
].
split
(
'
\n
'
)
for
file_name
in
(
files
):
if
(
path
.
startswith
(
'
/eos/
'
)):
fullname
.
append
(
'
root://eosatlas/
'
+
path
+
'
/
'
+
temp
[
0
]
)
fullname
.
append
(
'
root://eosatlas/
'
+
path
+
'
/
'
+
file_name
)
elif
ReadPool
and
not
RunFromLocal
:
fullname
.
append
(
'
castor:
'
+
path
+
'
/
'
+
temp
[
0
]
)
fullname
.
append
(
'
castor:
'
+
path
+
'
/
'
+
file_name
)
else
:
fullname
.
append
(
path
+
'
/
'
+
temp
[
0
]
)
fullname
.
append
(
path
+
'
/
'
+
file_name
)
return
[
fullname
,
run
]
...
...
@@ -593,16 +588,17 @@ rec.doLArg = False
# Get project name from file name and use it in RecFlags
# in order to set up right database instance in condb
projectName
=
FileNameVec
[
0
].
split
(
'
/
'
).
pop
().
split
(
'
.
'
)[
0
]
rec
.
projectName
=
projectName
rec
.
projectName
=
projectName
RUN2
=
False
if
not
'
RUN2
'
in
dir
():
RUN2
=
False
if
globalflags
.
DataSource
()
==
'
data
'
:
if
Year
>
2014
or
RunNumber
>
238000
or
projectName
.
startswith
(
"
data15_
"
):
RUN2
=
True
if
Year
>
2014
or
RunNumber
>
238000
or
projectName
.
startswith
(
"
data15_
"
)
or
RUN2
:
RUN2
=
True
else
:
# use RUN1 DB for runs taken before Sep-2014
if
projectName
.
startswith
(
"
data14_
"
):
rec
.
projectName
=
"
data13_tilecomm
"
globalflags
.
DatabaseInstance
=
"
COMP200
"
if
projectName
.
startswith
(
"
data14_
"
):
rec
.
projectName
=
"
data13_tilecomm
"
globalflags
.
DatabaseInstance
=
"
COMP200
"
from
IOVDbSvc.CondDB
import
conddb
from
AthenaCommon.GlobalFlags
import
jobproperties
...
...
@@ -618,7 +614,7 @@ if ReadPool:
svcMgr
.
EventSelector
.
InputCollections
=
FileNameVec
# Set Geometry version
if
not
'
DetDescrVersion
'
in
dir
():
DetDescrVersion
=
'
ATLAS-GEO-20-00-0
1
'
DetDescrVersion
=
'
ATLAS-GEO-20-00-0
2
'
else
:
# - ByteStream input
svcMgr
.
EventSelector
.
Input
=
FileNameVec
...
...
@@ -633,7 +629,7 @@ else:
conddb
.
setGlobalTag
(
CondDbTag
)
# Set Geometry version
if
not
'
DetDescrVersion
'
in
dir
():
DetDescrVersion
=
'
ATLAS-GEO-20-00-0
1
'
DetDescrVersion
=
'
ATLAS-GEO-20-00-0
2
'
jobproperties
.
Global
.
DetDescrVersion
=
DetDescrVersion
log
.
info
(
"
DetDescrVersion = %s
"
%
(
jobproperties
.
Global
.
DetDescrVersion
())
)
...
...
@@ -643,7 +639,7 @@ from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
GeoModelSvc
=
GeoModelSvc
()
GeoModelSvc
.
IgnoreTagDifference
=
True
log
.
info
(
"
GeoModelSvc.AtlasVersion = %s
"
%
(
GeoModelSvc
.
AtlasVersion
)
)
#GeoModelSvc.TileVersionOverride = "TileCal-GEO-0
5
"
#GeoModelSvc.TileVersionOverride = "TileCal-GEO-0
8
"
#log.info( "GeoModelSvc.TileVersionOverride = %s" % (GeoModelSvc.TileVersionOverride) )
...
...
@@ -655,7 +651,7 @@ if not 'TileCorrectAmplitude' in dir():
TileCorrectAmplitude
=
False
;
# don't do parabolic correction in OptATLAS
if
not
'
TileCorrectTime
'
in
dir
():
if
TilePhysRun
:
if
TilePhysRun
or
TilePhysTiming
:
TileCorrectTime
=
True
;
# APPLY time correction in physics runs
else
:
TileCorrectTime
=
False
;
# do not apply time correction - to be compatible with DSP reco
...
...
@@ -701,9 +697,6 @@ else:
tileInfoConfigurator
.
TileCondToolTiming
=
getTileCondToolTiming
(
'
COOL
'
,
'
PHY
'
)
print
tileInfoConfigurator
if
TileLasRun
:
ToolSvc
.
TileBadChanTool
.
ProxyOnlBch
=
getTileCondProxy
(
'
FILE
'
,
'
Bch
'
,
'
TileDefault.onlBch
'
,
'
TileCondProxyFile_OnlBch
'
)
#============================================================
#=== configure TileCondToolOfcCool
#============================================================
...
...
@@ -904,7 +897,7 @@ if (doTileNtuple or doD3PD):
exec
'
svcMgr.THistSvc.Output += [
"
AANT DATAFILE=
\'
%(dir)s/tile_%(RunNum).f_%(Version)s.aan.root
\'
OPT=
\'
RECREATE
\'
"
]
'
%
{
'
dir
'
:
OutputDirectory
,
'
RunNum
'
:
RunNumber
,
'
Version
'
:
Version
}
svcMgr
.
THistSvc
.
MaxFileSize
=
32768
from
AnalysisTools.
Ath
AnalysisToolsConf
import
AANTupleStream
from
AnalysisTools.AnalysisToolsConf
import
AANTupleStream
topSequence
+=
AANTupleStream
(
"
AANTupleStream1
"
)
AANTupleStream1
=
topSequence
.
AANTupleStream1
AANTupleStream1
.
ExtraRefNames
=
[
"
StreamESD
"
,
"
StreamRDO
"
]
...
...
@@ -1399,7 +1392,7 @@ theAuditorSvc.Auditors = [ "ChronoAuditor" ]
if
not
ReadPool
:
svcMgr
.
EventSelector
.
MaxBadEvents
=
10000
if
OutputLevel
<
2
:
svcMgr
.
ByteStreamInputSvc
.
DumpFlag
=
True
#
svcMgr.ByteStreamInputSvc.DumpFlag = True
ToolSvc
.
TileROD_Decoder
.
VerboseOutput
=
True
print
topSequence
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment